mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-01 06:20:55 +01:00
Code Releases Activity

users/12325: implement OSI rules for test & [, add more doc warnings

Browse source
This commit is contained in:
Peter Stephenson 2007-12-12 18:43:28 +00:00
parent 765f73823e
commit 64c85ae68a
3 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2007-12-12 Peter Stephenson <pws@csr.com>
* users/12325: Doc/Zsh/builtins.yo, Src/builtin.c:
implement OSI rules for three- and four-argument test and [ ... ]
commands and warn users about the problems.
* users/12305: Doc/Zsh/builtins.yo, Src/init.c,
Test/A01grammar.ztst: option output wasn't well described;
"-c" is documented not to set SHIN_STDIN, so don't.

10
Doc/Zsh/builtins.yo
View file

@ -1235,7 +1235,15 @@ tt(test) and tt([) builtins are: these commands are not handled
syntactically, so for example an empty variable expansion may cause an
argument to be omitted; syntax errors cause status 2 to be returned instead
of a shell error; and arithmetic operators expect integer arguments rather
than arithemetic expressions.
than arithmetic expressions.
The command attempts to implement POSIX and its extensions where these
are specified. Unfortunately there are intrinsic ambiguities in
the syntax; in particular there is no distinction between test operators
and strings that resemble them. The standard attempts to resolve these
for small numbers of arguments (up to four); for five or more arguments
compatibility cannot be relied on. Users are urged wherever possible to
use the `tt([[)' test syntax which does not have these ambiguities.
)
findex(times)
cindex(shell, timing)

15
Src/builtin.c
View file

@ -5506,6 +5506,7 @@ bin_test(char *name, char **argv, UNUSED(Options ops), int func)
char **s;
Eprog prog;
struct estate state;
int nargs;
/* if "test" was invoked as "[", it needs a matching "]" *
* which is subsequently ignored */
@ -5521,6 +5522,20 @@ bin_test(char *name, char **argv, UNUSED(Options ops), int func)
if (!*argv)
return 1;
/*
* Implement some XSI extensions to POSIX here.
* See
* http://www.opengroup.org/onlinepubs/009695399/utilities/test.html.
*/
nargs = arrlen(argv);
if (nargs == 3 || nargs == 4)
{
if (*argv[0] == '(' && *argv[nargs-1] == ')') {
argv[nargs-1] = NULL;
argv++;
}
}
testargs = argv;
tok = NULLTOK;
condlex = testlex;