Updates from both Vladimir and Larry

[oweals/busybox.git] / ps.c

diff --git a/ps.c b/ps.c
index eabdef40769db12708c1b95da1d51000691456a3..24f806c4b35d3e5dc45bd23c18e6b1883efa4d88 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 */
 
@@ -207,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);