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

[oweals/busybox.git] / ps.c

diff --git a/ps.c b/ps.c
index b9ff5bd0bc1ce5db29091e306256241ca159429b..13b6ce541d4e9dd1ae2715916314dbc7e906cd04 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -2,7 +2,7 @@
 /*
  * Mini ps implementation(s) for busybox
  *
- * Copyright (C) 1999 by Lineo, inc.  Written by Erik Andersen
+ * Copyright (C) 1999,2000 by Lineo, inc.  Written by Erik Andersen
  * <andersen@lineo.com>, <andersee@debian.org>
  *
  *
@@ -36,9 +36,15 @@
 #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_N_DEVMTAB
+
+
+#if ! defined BB_FEATURE_USE_DEVPS_PATCH
 
 /* The following is the first ps implementation --
  * the one using the /proc virtual filesystem.
@@ -121,19 +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 && **(argv + 1) == '-')
-               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);
@@ -162,13 +174,13 @@ extern int ps_main(int argc, char **argv)
                if (*groupName == '\0')
                        sprintf(groupName, "%d", p.rgid);
 
-               len = fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName,
-                               p.state);
                sprintf(path, "/proc/%s/cmdline", entry->d_name);
                file = fopen(path, "r");
                if (file == NULL)
-                       fatalError("Can't open %s: %s\n", path, strerror(errno));
+                       continue;
                i = 0;
+               len = fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName,
+                               p.state);
                while (((c = getc(file)) != EOF) && (i < (terminal_width-len))) {
                        i++;
                        if (c == '\0')
@@ -180,11 +192,11 @@ extern int ps_main(int argc, char **argv)
                fprintf(stdout, "\n");
        }
        closedir(dir);
-       exit(TRUE);
+       return(TRUE);
 }
 
 
-#else /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */
+#else /* BB_FEATURE_USE_DEVPS_PATCH */
 
 
 /* The following is the second ps implementation --
@@ -205,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) == '-') 
@@ -284,5 +296,5 @@ extern int ps_main(int argc, char **argv)
        exit (0);
 }
 
-#endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */
+#endif /* BB_FEATURE_USE_DEVPS_PATCH */