top: normal exit code should be 0

diff --git a/NEWS b/NEWS
index 01bc01f57faf5ea420c11da5765eca661f30d5e4..699b5a96b3f3dbde155af44611d43a9b3882618f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ procps-3.2.7 --> procps-3.2.8
 
 ps: document SCHED_BATCH and add "see also" for stime
 ps: man page less ambiguous
+top: normal exit code should be 0          #341272
 
 procps-3.2.6 --> procps-3.2.7
 

diff --git a/top.c b/top.c
index a71a80a889d58e89536b507b7e5ea8b6e9af0d74..19ddb0a96ded150985b531e3fddc48ccf77921fb 100644 (file)
--- a/top.c
+++ b/top.c
@@ -405,11 +405,12 @@ static void bye_bye (FILE *fp, int eno, const char *str)
          * Normal end of execution.
          * catches:
          *    SIGALRM, SIGHUP, SIGINT, SIGPIPE, SIGQUIT and SIGTERM */
-static void end_pgm (int dont_care_sig) NORETURN;
-static void end_pgm (int dont_care_sig)
+static void end_pgm (int sig) NORETURN;
+static void end_pgm (int sig)
 {
-   (void)dont_care_sig;
-   bye_bye(stdout, 1, NULL);
+   if(sig)
+      sig |= 0x80; // for a proper process exit code
+   bye_bye(stdout, sig, NULL);
 }
 
 
@@ -653,7 +654,7 @@ static void show_special (int interact, const char *glob)
    while ((lin_end = strchr(glob, '\n'))) {
 
          /* create a local copy we can extend and otherwise abuse */
-      memcpy(lin, glob, (unsigned)(lin_end - glob));
+      memcpy(lin, glob, (unsigned)(lin_end - glob));    FIXME -- buffer overflow
          /* zero terminate this part and prepare to parse substrings */
       lin[lin_end - glob] = '\0';
       room = Screen_cols;