about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2003-11-13 17:03:55 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2003-11-13 17:03:55 +0000
commit3bcec12bd0ec066cbc3d133d69823c8ae551dfff (patch)
tree2b112929bc578967f3a0a8de17ae901f2aa1a20f
parentaf7eba0c848d12629d41be991467d35a902a9e66 (diff)
downloadzsh-3bcec12bd0ec066cbc3d133d69823c8ae551dfff.tar.gz
zsh-3bcec12bd0ec066cbc3d133d69823c8ae551dfff.tar.xz
zsh-3bcec12bd0ec066cbc3d133d69823c8ae551dfff.zip
merge changes back from 4.1
-rw-r--r--ChangeLog6
-rw-r--r--Src/parse.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3569b26ac..b19706b8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1131,6 +1131,12 @@
         * unposted: Etc/BUGS, Etc/TODO: update relevant
 	issues.
 
+2002-03-07  Bart Schaefer  <schaefer@zsh.org>
+
+	* 16737 (tweaked): Src/parse.c: fix parsing of binary infix
+	operators of builtin `test' when there are more than three
+	arguments.
+
 2002-03-07  Clint Adams  <clint@zsh.org>
 
         * 16778: Completion/Unix/Command/.distfiles,
diff --git a/Src/parse.c b/Src/parse.c
index ddb163986..9f40b4348 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -1841,9 +1841,9 @@ par_cond_2(void)
 	    condlex();
 	    return par_cond_double(dupstring("-n"), s1);
 	}
-	if (testargs[1] && !testargs[2]) {
+	if (testargs[1]) {
 	    /* three arguments: if the second argument is a binary operator, *
-	     * perform that binary test on the first and the trird argument  */
+	     * perform that binary test on the first and the third argument  */
 	    if (!strcmp(*testargs, "=")  ||
 		!strcmp(*testargs, "==") ||
 		!strcmp(*testargs, "!=") ||