Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / ps.c

diff --git a/ps.c b/ps.c
index f8cf33b259ed8b6a6b74d57ef28749a2c2641d03..13b6ce541d4e9dd1ae2715916314dbc7e906cd04 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -36,6 +36,12 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <sys/ioctl.h>
+#define BB_DECLARE_EXTERN
+#define bb_need_help
+#include "messages.c"
+
+#define TERMINAL_WIDTH  79      /* not 80 in case terminal has linefold bug */
+
 
 
 #if ! defined BB_FEATURE_USE_DEVPS_PATCH
@@ -121,20 +127,25 @@ extern int ps_main(int argc, char **argv)
        int len, i, c;
 #ifdef BB_FEATURE_AUTOWIDTH
        struct winsize win = { 0, 0 };
-       int terminal_width = 0;
+       int terminal_width = TERMINAL_WIDTH;
 #else
-#define terminal_width  79
+#define terminal_width  TERMINAL_WIDTH
 #endif
 
 
 
-       if (argc > 1 && strcmp(argv[1], "--help") == 0) {
-               usage ("ps\n\nReport process status\n\nThis version of ps accepts no options.\n");
+       if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0) {
+               usage ("ps\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+                               "\nReport process status\n"
+                               "\nThis version of ps accepts no options.\n"
+#endif
+                               );
        }
 
        dir = opendir("/proc");
        if (!dir)
-               fatalError("Can't open /proc");
+               fatalError("Can't open /proc\n");
 
 #ifdef BB_FEATURE_AUTOWIDTH
                ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@ -181,7 +192,7 @@ extern int ps_main(int argc, char **argv)
                fprintf(stdout, "\n");
        }
        closedir(dir);
-       exit(TRUE);
+       return(TRUE);
 }
 
 
@@ -206,9 +217,9 @@ extern int ps_main(int argc, char **argv)
        char groupName[10] = "";
 #ifdef BB_FEATURE_AUTOWIDTH
        struct winsize win = { 0, 0 };
-       int terminal_width = 0;
+       int terminal_width = TERMINAL_WIDTH;
 #else
-#define terminal_width  79
+#define terminal_width  TERMINAL_WIDTH
 #endif
 
        if (argc > 1 && **(argv + 1) == '-')