From d5bfe26c457a97a8b525b6c27f5498525a5829bf Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Thu, 20 Feb 2020 08:23:03 +0000 Subject: 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 Signed-off-by: Denys Vlasenko --- shell/ash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shell') 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. -- cgit v1.2.3