Moved some code and add a coupld #defines to support use of dmalloc.

[oweals/busybox.git] / ps.c

diff --git a/ps.c b/ps.c
index b070e39845b5fb5247a4fa3b511b87bfc51db98a..fc58a9bb7215506f8cbaf026525a0f3143ea0eca 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -114,7 +114,6 @@ static void parse_proc_status(char *S, proc_t * P)
 
 }
 
-
 extern int ps_main(int argc, char **argv)
 {
        proc_t p;
@@ -134,14 +133,8 @@ extern int ps_main(int argc, char **argv)
 
 
 
-       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
-                               );
-       }
+       if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0)
+               usage(ps_usage);
 
        dir = opendir("/proc");
        if (!dir)
@@ -223,7 +216,7 @@ extern int ps_main(int argc, char **argv)
 #endif
 
        if (argc > 1 && **(argv + 1) == '-') 
-               usage("ps-devps\n\nReport process status\n\nThis version of ps accepts no options.\n\n");
+               usage(ps_usage);
 
        /* open device */ 
        fd = open(device, O_RDONLY);