diff options
author | Ron Yorston <rmy@pobox.com> | 2016-02-22 10:00:45 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-02-22 10:00:45 +0000 |
commit | 371c20c008254a36e7157df6c13dc2e4cf87d6fd (patch) | |
tree | a214c03f6617dffa60df2192b312a46c93b7c19f /shell | |
parent | ab879a41ab674129ef1593cda181cc8b64d0dadf (diff) | |
parent | 3a5cc989025eefe03fda0552b253a4a8f015a761 (diff) | |
download | busybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.tar.gz busybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.tar.bz2 busybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index de5c44ead..57d192822 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -51,7 +51,6 @@ | |||
51 | 51 | ||
52 | #define JOBS ENABLE_ASH_JOB_CONTROL | 52 | #define JOBS ENABLE_ASH_JOB_CONTROL |
53 | 53 | ||
54 | #include <paths.h> | ||
55 | #include <setjmp.h> | 54 | #include <setjmp.h> |
56 | #include <fnmatch.h> | 55 | #include <fnmatch.h> |
57 | #include <sys/times.h> | 56 | #include <sys/times.h> |
@@ -8823,7 +8822,7 @@ evaltree(union node *n, int flags) | |||
8823 | n->nbinary.ch1, | 8822 | n->nbinary.ch1, |
8824 | (flags | ((is_or >> 1) - 1)) & EV_TESTED | 8823 | (flags | ((is_or >> 1) - 1)) & EV_TESTED |
8825 | ); | 8824 | ); |
8826 | if (!exitstatus == is_or) | 8825 | if ((!exitstatus) == is_or) |
8827 | break; | 8826 | break; |
8828 | if (!evalskip) { | 8827 | if (!evalskip) { |
8829 | n = n->nbinary.ch2; | 8828 | n = n->nbinary.ch2; |