diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-03-14 08:52:28 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-03-14 08:52:28 +0000 |
commit | 26a8016da6d4bb1b92efae8b83fbd6b3dcc5e5a2 (patch) | |
tree | 2260000f09511aa7c123ce6b651c9d1a91083a62 | |
parent | fe42d17318fffed53f02617fd668d896000bdd28 (diff) | |
download | busybox-w32-26a8016da6d4bb1b92efae8b83fbd6b3dcc5e5a2.tar.gz busybox-w32-26a8016da6d4bb1b92efae8b83fbd6b3dcc5e5a2.tar.bz2 busybox-w32-26a8016da6d4bb1b92efae8b83fbd6b3dcc5e5a2.zip |
- change option -c to -Z to match newer upstream SElinux conventions
-rw-r--r-- | include/usage.h | 2 | ||||
-rw-r--r-- | procps/ps.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/usage.h b/include/usage.h index 23703736f..7abd9ef7d 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -2575,7 +2575,7 @@ | |||
2575 | "Report process status\n" \ | 2575 | "Report process status\n" \ |
2576 | USAGE_PS \ | 2576 | USAGE_PS \ |
2577 | USE_SELINUX( \ | 2577 | USE_SELINUX( \ |
2578 | "\n -c Show SE Linux context") \ | 2578 | "\n -Z Show SE Linux context") \ |
2579 | USE_FEATURE_PS_WIDE( \ | 2579 | USE_FEATURE_PS_WIDE( \ |
2580 | "\n w Wide output") | 2580 | "\n w Wide output") |
2581 | 2581 | ||
diff --git a/procps/ps.c b/procps/ps.c index c06d333cd..c1cb64397 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -298,7 +298,7 @@ int ps_main(int argc, char **argv) | |||
298 | #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX | 298 | #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX |
299 | #if ENABLE_FEATURE_PS_WIDE | 299 | #if ENABLE_FEATURE_PS_WIDE |
300 | opt_complementary = "-:ww"; | 300 | opt_complementary = "-:ww"; |
301 | USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("c") "w", &w_count); | 301 | USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("Z") "w", &w_count); |
302 | /* if w is given once, GNU ps sets the width to 132, | 302 | /* if w is given once, GNU ps sets the width to 132, |
303 | * if w is given more than once, it is "unlimited" | 303 | * if w is given more than once, it is "unlimited" |
304 | */ | 304 | */ |
@@ -310,7 +310,7 @@ int ps_main(int argc, char **argv) | |||
310 | terminal_width--; | 310 | terminal_width--; |
311 | } | 311 | } |
312 | #else /* only ENABLE_SELINUX */ | 312 | #else /* only ENABLE_SELINUX */ |
313 | i = getopt32(argc, argv, "c"); | 313 | i = getopt32(argc, argv, "Z"); |
314 | #endif | 314 | #endif |
315 | #if ENABLE_SELINUX | 315 | #if ENABLE_SELINUX |
316 | if ((i & 1) && is_selinux_enabled()) | 316 | if ((i & 1) && is_selinux_enabled()) |