Some more patchelttes from Larry Doolittle.

[oweals/busybox.git] / ps.c

diff --git a/ps.c b/ps.c
index 4ff7a8a58cab7b47137a4f8900f2c0dc76f877d1..bf162bbe53e21ef7775d01842bd47b94c1b88011 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -28,7 +28,6 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -38,9 +37,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#define BB_DECLARE_EXTERN
-#define bb_need_help
-#include "messages.c"
+#include "busybox.h"
 
 static const int TERMINAL_WIDTH = 79;      /* not 80 in case terminal has linefold bug */
 
@@ -52,10 +49,6 @@ static const int TERMINAL_WIDTH = 79;      /* not 80 in case terminal has linefo
  * the one using the /proc virtual filesystem.
  */
 
-#if ! defined BB_FEATURE_USE_PROCFS
-#error Sorry, I depend on the /proc filesystem right now.
-#endif
-
 typedef struct proc_s {
        char
         cmd[16];                                       /* basename of executable file in call to exec(2) */
@@ -101,7 +94,7 @@ static void parse_proc_status(char *S, proc_t * P)
        else
                error_msg("Internal error!");
 
-       /* For busybox, ignoring effective, saved, etc */
+       /* For busybox, ignoring effective, saved, etc. */
        tmp = strstr(S, "Uid:");
        if (tmp)
                sscanf(tmp, "Uid:\t%d", &P->ruid);
@@ -211,7 +204,7 @@ extern int ps_main(int argc, char **argv)
 #endif
 
        if (argc > 1 && **(argv + 1) == '-') 
-               usage(ps_usage);
+               show_usage();
 
        /* open device */ 
        fd = open(device, O_RDONLY);