X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..7711f3fc00259e55f630cfe6104eff3083dc9d77:/sbr/pidstatus.c

diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c
index f16f7e0b..1c1f7348 100644
--- a/sbr/pidstatus.c
+++ b/sbr/pidstatus.c
@@ -14,10 +14,6 @@
  */
 #include <sigmsg.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 #ifndef WTERMSIG
 # define WTERMSIG(s) ((int)((s) & 0x7F))
 #endif
@@ -26,6 +22,14 @@
 # define WCOREDUMP(s) ((s) & 0x80)
 #endif
 
+/*
+ * Return 0 if the command exited with an exit code of zero, a nonzero code
+ * otherwise.
+ *
+ * Print out an appropriate status message we didn't exit with an exit code
+ * of zero.
+ */
+
 int
 pidstatus (int status, FILE *fp, char *cp)
 {
@@ -46,6 +50,7 @@ pidstatus (int status, FILE *fp, char *cp)
 		fprintf (fp, "%s: ", cp);
 	    fprintf (fp, "exit %d\n", signum);
 	}
+	return signum;
     } else if (WIFSIGNALED(status)) {
 	/* If child process terminated due to receipt of a signal */
 	signum = WTERMSIG(status);
@@ -53,7 +58,8 @@ pidstatus (int status, FILE *fp, char *cp)
 	    if (cp)
 		fprintf (fp, "%s: ", cp);
 	    fprintf (fp, "signal %d", signum);
-	    if (signum >= 0 && signum < sizeof(sigmsg) && sigmsg[signum] != NULL)
+	    if (signum >= 0 && signum < (int) sizeof(sigmsg) &&
+                  sigmsg[signum] != NULL)
 		fprintf (fp, " (%s%s)\n", sigmsg[signum],
 			 WCOREDUMP(status) ? ", core dumped" : "");
 	    else