Reverted commit 9a4b4a3d3b27fe4a7ff6d0b8724ce1c06b5917eb.

[nmh] / sbr / pidstatus.c

diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c
index 7991d5925a6a22cb385496a15f42d33517a0a18c..ded38edc15801a8299a7a5bfce203951430c6b66 100644 (file)
--- a/sbr/pidstatus.c
+++ b/sbr/pidstatus.c
@@ -2,8 +2,6 @@
 /*
  * pidstatus.c -- report child's status
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -11,15 +9,6 @@
 
 #include <h/mh.h>
 
-/*
- * auto-generated header
- */
-#include <sigmsg.h>
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 #ifndef WTERMSIG
 # define WTERMSIG(s) ((int)((s) & 0x7F))
 #endif
@@ -28,10 +17,19 @@
 # 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)
 {
     int signum;
+    char *signame;
 
 /*
  * I have no idea what this is for (rc)
@@ -48,15 +46,22 @@ pidstatus (int status, FILE *fp, char *cp)
                fprintf (fp, "%s: ", cp);
            fprintf (fp, "exit %d\n", signum);
        }
-    } else if (WIFSIGNALED(status)) {
+       return signum;
+    }
+
+    if (WIFSIGNALED(status)) {
        /* If 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 < sizeof(sigmsg) && sigmsg[signum] != NULL)
-               fprintf (fp, " (%s%s)\n", sigmsg[signum],
+           errno = 0;
+           signame = strsignal(signum);
+           if (errno)
+               signame = NULL;
+           if (signame)
+               fprintf (fp, " (%s%s)\n", signame,
                         WCOREDUMP(status) ? ", core dumped" : "");
            else
                fprintf (fp, "%s\n", WCOREDUMP(status) ? " (core dumped)" : "");