41beb5378
Denys Vlasenko
2021-09-07
Subject
ash: eval: Check nflag in evaltree instead of cmdloop
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash.c +4 -1shell/ash_test/ash-misc/set-n1.right +3 -0shell/ash_test/ash-misc/set-n1.tests +2 -0
shell/ash.c+4 -1
| @@ -9299,6 +9299,9 @@ evaltree(union node *n, int flags) | |
| setstackmark(&smark); | |
| + | if (nflag) |
| + | goto out; |
| + | |
| if (n == NULL) { | |
| TRACE(("evaltree(NULL) called\n")); | |
| goto out; | |
| @@ -13557,7 +13560,7 @@ cmdloop(int top) | |
| out2str("\nUse \"exit\" to leave shell.\n"); | |
| } | |
| numeof++; | |
| - | } else if (nflag == 0) { |
| + | } else { |
| int i; | |
| /* job_warning can only be 2,1,0. Here 2->1, 1/0->0 */ | |
shell/ash_test/ash-misc/set-n1.right+3 -0
| @@ -0,0 +1,3 @@ | |
| + | set -n stops in -c? |
| + | YES |
| + | Ok:0 |
shell/ash_test/ash-misc/set-n1.tests+2 -0
| @@ -0,0 +1,2 @@ | |
| + | $THIS_SH -c "echo 'set -n stops in -c?'; set -n; echo NO" && echo YES |
| + | echo Ok:$? |