- add option 'w' to ps (wide output, optional feature defaults to off).

- move to ENABLE_ and use shorter boilerplate.

sizes without selinux-support:
   text	   data	    bss	    dec	    hex	filename
    356	      0	      0	    356	    164	procps/ps.o.with-w
    300	      0	      0	    300	    12c	procps/ps.o.no-w
    302	      0	      0	    302	    12e	procps/ps.o.oorig



git-svn-id: svn://busybox.net/trunk/busybox@11751 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 2 insertions, 8 deletions

diff --git a/include/usage.h b/include/usage.h
index 8428bfd32..fad50efdc 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -2245,17 +2245,12 @@
         "$ printf \"Val=%d\\n\" 5\n" \
         "Val=5\n"
 
-#if !defined(CONFIG_SELINUX) && !defined(CONFIG_PS_FEATURE_WIDE)
+#if !defined CONFIG_SELINUX && !ENABLE_FEATURE_PS_WIDE
 #define USAGE_PS "\n\tThis version of ps accepts no options."
 #else
 #define USAGE_PS "\nOptions:"
 #endif
-#ifdef CONFIG_SELINUX
-#define USAGE_NONSELINUX(a)
-#else
-#define USAGE_NONSELINUX(a) a
-#endif
-#ifdef CONFIG_PS_FEATURE_WIDE
+#if ENABLE_FEATURE_PS_WIDE
 #define USAGE_PS_WIDE(a) a
 #else
 #define USAGE_PS_WIDE(a)
@@ -2269,7 +2264,6 @@
         USAGE_SELINUX("\n\t-c\tshow SE Linux context") \
         USAGE_PS_WIDE("\n\tw\twide output")
 
-
 #define ps_example_usage \
         "$ ps\n" \
         "  PID  Uid      Gid State Command\n" \