JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix regression introduced with test(1) rewrite in R40d:

Browse Source 
evaluation errors were not returned any more

Bug spotted and patch by Martijn Dekker <martijn@inlv.org>
This commit is contained in:
tg 2015-12-12 19:27:36 +00:00
parent aa4ad0c2e4
commit 66ace7e647
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
funcs.c
View File

@ -38,7 +38,7 @@
#endif #endif
#endif #endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.287 2015/10/24 19:46:09 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.288 2015/12/12 19:27:36 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -2856,7 +2856,7 @@ c_test(const char **wp)
/* /*
* Attempt to conform to POSIX special cases. This is pretty * Attempt to conform to POSIX special cases. This is pretty
* dumb code straight-forward from the 2008 spec, but unless * dumb code straight-forward from the 2008 spec, but unlike
* the old pdksh code doesn't live from so many assumptions. * the old pdksh code doesn't live from so many assumptions.
* It does, though, inline some calls to '(*te.funcname)()'. * It does, though, inline some calls to '(*te.funcname)()'.
*/ */
@ -2877,6 +2877,8 @@ c_test(const char **wp)
ptest_unary: ptest_unary:
rv = test_eval(&te, op, *te.pos.wp++, NULL, true); rv = test_eval(&te, op, *te.pos.wp++, NULL, true);
ptest_out: ptest_out:
if (te.flags & TEF_ERROR)
return (T_ERR_EXIT);
return ((invert & 1) ? rv : !rv); return ((invert & 1) ? rv : !rv);
} }
/* let the parser deal with anything else */ /* let the parser deal with anything else */