summary refs log tree commit diff
path: root/etc/psf/Makefile
diff options
context:
space:2018-03-26 23:55:50 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2018-04-19 18:19:29 +0800
commit03876c0743a50984b0aae69bba6f5034dc38aec1 (patch)
tree84June McEnroe <june@causal.agency>2018-09-05 01:45:07 -0400
commit7f73ae089e76411d728e8da8630f6a8404fc8f7d (patch)
tree7774e842a9ebc5bddc001a81ca3b5050de0718b5 /etc/psf/Makefile
parentSimplify glitch -x -y to just zero (diff)
downloadsrc-7f73ae089e76411d728e8da8630f6a8404fc8f7d.tar.gz
src-7f73ae089e76411d728e8da8630f6a8404fc8f7d.zip
Zero after mirror
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions
 

generated by cgit-pink 1.4.1 (git 2.36.1) at 2026-07-08 09:58:46 +0000


 


' style='width: 45.5%;'/>

2 files changed, 11 insertions, 8 deletions
diff --git a/src/eval.c b/src/eval.c
index 7498f9d..19e06ec 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -848,6 +848,8 @@ bail:
 		goto out;
 	}
 
+	jp = NULL;
+
 	/* Execute the command. */
 	switch (cmdentry.cmdtype) {
 	default:
@@ -856,7 +858,6 @@ bail:
 			INTOFF;
 			jp = makejob(cmd, 1);
 			if (forkshell(jp, cmd, FORK_FG) != 0) {
-				status = waitforjob(jp);
 				INTON;
 				break;
 			}
@@ -875,22 +876,22 @@ bail:
 		if (evalbltin(cmdentry.u.cmd, argc, argv, flags)) {
 			if (exception == EXERROR && spclbltin <= 0) {
 				FORCEINTON;
-				goto readstatus;
+				break;
 			}
 raise:
 			longjmp(handler->loc, 1);
 		}
-		goto readstatus;
+		break;
 
 	case CMDFUNCTION:
 		poplocalvars(1);
 		if (evalfun(cmdentry.u.func, argc, argv, flags))
 			goto raise;
-readstatus:
-		status = exitstatus;
 		break;
 	}
 
+	status = waitforjob(jp);
+
 out:
 	if (cmd->ncmd.redirect)
 		popredir(execcmd);
diff --git a/src/jobs.c b/src/jobs.c
index f0d34ab..1a97c54 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -53,6 +53,7 @@
 #include <termios.h>
 #undef CEOF			/* syntax.h redefines this */
 #endif
+#include "eval.h"
 #include "redir.h"
 #include "show.h"
 #include "main.h"
@@ -973,10 +974,11 @@ waitforjob(struct job *jp)
 {
 	int st;
 
-	TRACE(("waitforjob(%%%d) called\n", jobno(jp)));
-	while (jp->state == JOBRUNNING) {
+	TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0));
+	while ((jp && jp->state == JOBRUNNING) || gotsigchld)
 		dowait(DOWAIT_BLOCK, jp);
-	}
+	if (!jp)
+		return exitstatus;
 	st = getstatus(jp);
 #if JOBS
 	if (jp->jobctl) {

 

generated by cgit-pink 1.4.1 (git 2.36.1) at 2026-07-08 09:58:46 +0000