diff options
author | June McEnroe <june@causal.agency> | 2021-06-20 13:45:29 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2021-06-20 13:46:46 -0400 |
commit | e4554744950ee3262940fc97177d36affbd06b1f (patch) | |
tree | 0af86e1709bc057d14127b3c7c35f0b872b44b03 /bin/dash/src/eval.c | |
parent | sctd more aggressively (diff) | |
parent | Squashed 'bin/dash/' changes from a45870f7..efc7765b (diff) | |
download | src-e4554744950ee3262940fc97177d36affbd06b1f.tar.gz src-e4554744950ee3262940fc97177d36affbd06b1f.zip |
Merge dash v0.5.11.4
Diffstat (limited to 'bin/dash/src/eval.c')
-rw-r--r-- | bin/dash/src/eval.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/bin/dash/src/eval.c b/bin/dash/src/eval.c index 1b5d61dc..d4190f95 100644 --- a/bin/dash/src/eval.c +++ b/bin/dash/src/eval.c @@ -245,18 +245,10 @@ evaltree(union node *n, int flags) popredir(0); goto setstatus; case NCMD: -#ifdef notyet - if (eflag && !(flags & EV_TESTED)) - checkexit = ~0; - status = evalcommand(n, flags, (struct backcmd *)NULL); - goto setstatus; -#else evalfn = evalcommand; checkexit: - if (eflag && !(flags & EV_TESTED)) - checkexit = ~0; + checkexit = ~flags & EV_TESTED; goto calleval; -#endif case NFOR: evalfn = evalfor; goto calleval; @@ -316,7 +308,7 @@ setstatus: out: dotrap(); - if (checkexit & status) + if (eflag && checkexit && status) goto exexit; if (flags & EV_EXIT) { |