aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2020-02-20 08:23:03 +0000
committerDenys Vlasenko <vda.linux@googlemail.com>2020-02-20 10:39:46 +0100
commitd5bfe26c457a97a8b525b6c27f5498525a5829bf (patch)
treea80b55274ac3fa64dd93244064e75a875d27abdd
parentecc85832f8b4d8278b0a17aa62b0c8a9f81461e4 (diff)
downloadbusybox-d5bfe26c457a97a8b525b6c27f5498525a5829bf.tar.gz
ash: return exit status of nofork applets (again)
Since commit d81af7216 (ash: eval: Reap zombies after built-in commands and functions) if the shell is compiled with SH_STANDALONE and SH_NOFORK enabled nofork applets potentially return the incorrect status. The status value returned by evalcommand() in this case is obtained from exitstatus in a call to waitforjob(NULL). This overwrites the status set for nonfork applets. If this commit seems familiar it's essentially a reversion of commit 5ccb0e92fa (ash: return exit status of nofork applets). What was correct in 2016 is wrong in 2020 and vice versa. Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 6087416ab..a6f777800 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10351,7 +10351,7 @@ evalcommand(union node *cmd, int flags)
* and/or wait for user input ineligible for NOFORK:
* for example, "yes" or "rm" (rm -i waits for input).
*/
- status = run_nofork_applet(applet_no, argv);
+ exitstatus = run_nofork_applet(applet_no, argv);
environ = sv_environ;
/*
* Try enabling NOFORK for "yes" applet.