diff options
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 5 | ||||
-rw-r--r-- | shell/ash_test/ash-misc/set-n1.right | 3 | ||||
-rwxr-xr-x | shell/ash_test/ash-misc/set-n1.tests | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index cfe0433a8..2d2c09ba5 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -9299,6 +9299,9 @@ evaltree(union node *n, int flags) | |||
9299 | 9299 | ||
9300 | setstackmark(&smark); | 9300 | setstackmark(&smark); |
9301 | 9301 | ||
9302 | if (nflag) | ||
9303 | goto out; | ||
9304 | |||
9302 | if (n == NULL) { | 9305 | if (n == NULL) { |
9303 | TRACE(("evaltree(NULL) called\n")); | 9306 | TRACE(("evaltree(NULL) called\n")); |
9304 | goto out; | 9307 | goto out; |
@@ -13557,7 +13560,7 @@ cmdloop(int top) | |||
13557 | out2str("\nUse \"exit\" to leave shell.\n"); | 13560 | out2str("\nUse \"exit\" to leave shell.\n"); |
13558 | } | 13561 | } |
13559 | numeof++; | 13562 | numeof++; |
13560 | } else if (nflag == 0) { | 13563 | } else { |
13561 | int i; | 13564 | int i; |
13562 | 13565 | ||
13563 | /* job_warning can only be 2,1,0. Here 2->1, 1/0->0 */ | 13566 | /* job_warning can only be 2,1,0. Here 2->1, 1/0->0 */ |
diff --git a/shell/ash_test/ash-misc/set-n1.right b/shell/ash_test/ash-misc/set-n1.right new file mode 100644 index 000000000..ac01831a7 --- /dev/null +++ b/shell/ash_test/ash-misc/set-n1.right | |||
@@ -0,0 +1,3 @@ | |||
1 | set -n stops in -c? | ||
2 | YES | ||
3 | Ok:0 | ||
diff --git a/shell/ash_test/ash-misc/set-n1.tests b/shell/ash_test/ash-misc/set-n1.tests new file mode 100755 index 000000000..90d0f9146 --- /dev/null +++ b/shell/ash_test/ash-misc/set-n1.tests | |||
@@ -0,0 +1,2 @@ | |||
1 | $THIS_SH -c "echo 'set -n stops in -c?'; set -n; echo NO" && echo YES | ||
2 | echo Ok:$? | ||