Cleaned up a bit, mostly in comments for each function.

[nmh] / sbr / pidstatus.c

diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c
index fab90d5eecf6ac2dd6a9689085c2b0e299a1a585..82f2d1194159853bc57fc19e9d8e88472129b8eb 100644 (file)
--- a/sbr/pidstatus.c
+++ b/sbr/pidstatus.c
@@ -7,14 +7,8 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <sys/wait.h>

 #include <h/mh.h>
 
 #include <h/mh.h>
 

-/*
- * auto-generated header
- */
-#include <sigmsg.h>
-

 #ifndef WTERMSIG
 # define WTERMSIG(s) ((int)((s) & 0x7F))
 #endif
 #ifndef WTERMSIG
 # define WTERMSIG(s) ((int)((s) & 0x7F))
 #endif


@@ -23,10 +17,19 @@
 # define WCOREDUMP(s) ((s) & 0x80)
 #endif
 
 # 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;
 int
 pidstatus (int status, FILE *fp, char *cp)
 {
     int signum;

+    char *signame;

 
 /*
  * I have no idea what this is for (rc)
 
 /*
  * I have no idea what this is for (rc)


@@ -43,6 +46,7 @@ pidstatus (int status, FILE *fp, char *cp)
                fprintf (fp, "%s: ", cp);
            fprintf (fp, "exit %d\n", signum);
        }
                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);
     } else if (WIFSIGNALED(status)) {
        /* If child process terminated due to receipt of a signal */
        signum = WTERMSIG(status);


@@ -50,9 +54,12 @@ pidstatus (int status, FILE *fp, char *cp)
            if (cp)
                fprintf (fp, "%s: ", cp);
            fprintf (fp, "signal %d", signum);
            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],
+           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)" : "");
                         WCOREDUMP(status) ? ", core dumped" : "");
            else
                fprintf (fp, "%s\n", WCOREDUMP(status) ? " (core dumped)" : "");