emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2007-03-14 08:52:28 +00:00
parent fe42d17318
commit 26a8016da6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/usage.h
View File

@ -2575,7 +2575,7 @@
"Report process status\n" \ "Report process status\n" \
USAGE_PS \ USAGE_PS \
USE_SELINUX( \ USE_SELINUX( \
"\n -c Show SE Linux context") \ "\n -Z Show SE Linux context") \
USE_FEATURE_PS_WIDE( \ USE_FEATURE_PS_WIDE( \
"\n w Wide output") "\n w Wide output")

4
procps/ps.c
View File

@ -298,7 +298,7 @@ int ps_main(int argc, char **argv)
#if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
#if ENABLE_FEATURE_PS_WIDE #if ENABLE_FEATURE_PS_WIDE
opt_complementary = "-:ww"; 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 once, GNU ps sets the width to 132,
* if w is given more than once, it is "unlimited" * if w is given more than once, it is "unlimited"
*/ */
@ -310,7 +310,7 @@ int ps_main(int argc, char **argv)
terminal_width--; terminal_width--;
} }
#else /* only ENABLE_SELINUX */ #else /* only ENABLE_SELINUX */
i = getopt32(argc, argv, "c"); i = getopt32(argc, argv, "Z");
#endif #endif
#if ENABLE_SELINUX #if ENABLE_SELINUX
if ((i & 1) && is_selinux_enabled()) if ((i & 1) && is_selinux_enabled())