[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox-cvs
Subject:    [git commit] ash: move TRACE statement in evalcommand()
From:       Denys Vlasenko <vda.linux () googlemail ! com>
Date:       2020-02-24 11:52:41
Message-ID: 20200224114106.300608E8B3 () busybox ! osuosl ! org
[Download RAW message or body]

commit: https://git.busybox.net/busybox/commit/?id=6cda0b04a3d3c36312adf7a9aa608306f6a5704a
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Following recent work on evalcommand() a TRACE statement to report
the status of a forked command was left in the wrong place.

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 shell/ash.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/ash.c b/shell/ash.c
index bf6a86d3d..03864c667 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10392,7 +10392,6 @@ evalcommand(union node *cmd, int flags)
 			jp = makejob(/*cmd,*/ 1);
 			if (forkshell(jp, cmd, FORK_FG) != 0) {
 				/* parent */
-				TRACE(("forked child exited with %d\n", status));
 				break;
 			}
 			/* child */
@@ -10418,6 +10417,8 @@ evalcommand(union node *cmd, int flags)
 	} /* switch */
 
 	status = waitforjob(jp);
+	if (jp)
+		TRACE(("forked child exited with %d\n", status));
 	FORCE_INT_ON;
 
  out:
_______________________________________________
busybox-cvs mailing list
busybox-cvs@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox-cvs
[prev in list] [next in list] [prev in thread] [next in thread]