From 3bcec12bd0ec066cbc3d133d69823c8ae551dfff Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Thu, 13 Nov 2003 17:03:55 +0000 Subject: merge changes back from 4.1 --- ChangeLog | 6 ++++++ Src/parse.c | 4 ++-- 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 + + * 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 * 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, "!=") || -- cgit 1.4.1