svn commit: trunk/busybox: include procps

[aldot at busybox.net]

Author: aldot
Date: 2007-03-14 01:52:28 -0700 (Wed, 14 Mar 2007)
New Revision: 18098

Log:
- change option -c to -Z to match newer upstream SElinux conventions


Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/procps/ps.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2007-03-14 03:45:56 UTC (rev 18097)
+++ trunk/busybox/include/usage.h	2007-03-14 08:52:28 UTC (rev 18098)
@@ -2575,7 +2575,7 @@
        "Report process status\n" \
 	USAGE_PS \
 	USE_SELINUX( \
-       "\n	-c	Show SE Linux context") \
+       "\n	-Z	Show SE Linux context") \
 	USE_FEATURE_PS_WIDE( \
        "\n	w	Wide output")
 

Modified: trunk/busybox/procps/ps.c
===================================================================
--- trunk/busybox/procps/ps.c	2007-03-14 03:45:56 UTC (rev 18097)
+++ trunk/busybox/procps/ps.c	2007-03-14 08:52:28 UTC (rev 18098)
@@ -298,7 +298,7 @@
 #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
 #if ENABLE_FEATURE_PS_WIDE
 	opt_complementary = "-:ww";
-	USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("c") "w", &w_count);
+	USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("Z") "w", &w_count);
 	/* if w is given once, GNU ps sets the width to 132,
 	 * if w is given more than once, it is "unlimited"
 	 */
@@ -310,7 +310,7 @@
 		terminal_width--;
 	}
 #else /* only ENABLE_SELINUX */
-	i = getopt32(argc, argv, "c");
+	i = getopt32(argc, argv, "Z");
 #endif
 #if ENABLE_SELINUX
 	if ((i & 1) && is_selinux_enabled())