revert wrong fix

This commit is contained in:
tg 2008-03-28 18:46:59 +00:00
parent 0a35cabb31
commit 5728495366

View File

@ -5,7 +5,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.71 2008/03/28 13:46:52 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.72 2008/03/28 18:46:59 tg Exp $");
/* A leading = means assignments before command are kept; /* A leading = means assignments before command are kept;
* a leading * means a POSIX special builtin; * a leading * means a POSIX special builtin;
@ -2494,7 +2494,7 @@ c_test(const char **wp)
return !0; return !0;
if (argc == 3) { if (argc == 3) {
opnd1 = (*te.getopnd)(&te, TO_NONOP, 1); opnd1 = (*te.getopnd)(&te, TO_NONOP, 1);
if ((op = (*te.isa)(&te, TM_BINOP)) != TO_NONOP) { if ((op = (*te.isa)(&te, TM_BINOP))) {
opnd2 = (*te.getopnd)(&te, op, 1); opnd2 = (*te.getopnd)(&te, op, 1);
res = (*te.eval)(&te, op, opnd1, res = (*te.eval)(&te, op, opnd1,
opnd2, 1); opnd2, 1);
@ -2788,7 +2788,7 @@ test_primary(Test_env *te, int do_eval)
} }
return res; return res;
} }
if ((op = (*te->isa)(te, TM_UNOP)) != TO_NONOP) { if ((op = (*te->isa)(te, TM_UNOP))) {
/* unary expression */ /* unary expression */
opnd1 = (*te->getopnd)(te, op, do_eval); opnd1 = (*te->getopnd)(te, op, do_eval);
if (!opnd1) { if (!opnd1) {
@ -2803,7 +2803,7 @@ test_primary(Test_env *te, int do_eval)
(*te->error)(te, 0, "expression expected"); (*te->error)(te, 0, "expression expected");
return 0; return 0;
} }
if ((op = (*te->isa)(te, TM_BINOP)) != TO_NONOP) { if ((op = (*te->isa)(te, TM_BINOP))) {
/* binary expression */ /* binary expression */
opnd2 = (*te->getopnd)(te, op, do_eval); opnd2 = (*te->getopnd)(te, op, do_eval);
if (!opnd2) { if (!opnd2) {