X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fpidstatus.c;h=cb0cb1c45a876364dbba24c02d3d00de058bcf63;hp=edd67490576730f9841a1a0a097a10b322e0f27b;hb=43b38cc6c82b85aff3a5868289ecebeb20215b9c;hpb=bcee4360d0113d2cbc71c9b0d13495327894e454

diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c
index edd6749..cb0cb1c 100644
--- a/sbr/pidstatus.c
+++ b/sbr/pidstatus.c
@@ -35,30 +35,41 @@ pidstatus(int status, FILE *fp, char *cp)
 	**      return status;
 	*/
 
-	/* If child process returned normally */
 	if (WIFEXITED(status)) {
+		/* child process returned normally */
 		if ((signum = WEXITSTATUS(status))) {
-			if (cp)
+			if (cp) {
 				fprintf(fp, "%s: ", cp);
+			}
 			fprintf(fp, "exit %d\n", signum);
 		}
 	} else if (WIFSIGNALED(status)) {
-		/* If child process terminated due to receipt of a signal */
+		/* child process terminated due to receipt of a signal */
 		signum = WTERMSIG(status);
-		if (signum != SIGINT) {
-			if (cp)
-				fprintf(fp, "%s: ", cp);
-			fprintf(fp, "signal %d", signum);
-			if (signum >= 0 && signum < (int)sizeof(sigmsg) &&
-					sigmsg[signum] != NULL)
-				fprintf(fp, " (%s%s)\n", sigmsg[signum],
-						WCOREDUMP(status) ?
-						", core dumped" : "");
-			else
-				fprintf(fp, "%s\n", WCOREDUMP(status) ?
-						" (core dumped)" : "");
+		if (signum == SIGINT) {
+			return status;
+		}
+		if (cp) {
+			fprintf(fp, "%s: ", cp);
+		}
+		fprintf(fp, "signal %d", signum);
+		if (signum >= 0 && signum < (int)sizeof(sigmsg) &&
+				sigmsg[signum] != NULL) {
+			fprintf(fp, " (%s%s)\n", sigmsg[signum],
+					WCOREDUMP(status) ?
+					", core dumped" : "");
+		} else {
+			fprintf(fp, "%s\n", WCOREDUMP(status) ?
+					" (core dumped)" : "");
 		}
 	}
 
 	return status;
 }
+
+
+int
+pidXwait(int pid, char *cp)
+{
+	return pidstatus(pidwait(pid, -1), stdout, cp);
+}