diff options
| author | Bernhard Reutner-Fischer | 2007-03-14 08:52:28 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2007-03-14 08:52:28 +0000 |
| commit | 26a8016da6d4bb1b92efae8b83fbd6b3dcc5e5a2 (patch) | |
| tree | 2260000f09511aa7c123ce6b651c9d1a91083a62 | |
| parent | fe42d17318fffed53f02617fd668d896000bdd28 (diff) | |
| download | busybox-26a8016da6d4bb1b92efae8b83fbd6b3dcc5e5a2.zip busybox-26a8016da6d4bb1b92efae8b83fbd6b3dcc5e5a2.tar.gz | |
- 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 2370373..7abd9ef 100644 --- a/include/usage.h +++ b/include/usage.h @@ -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") diff --git a/procps/ps.c b/procps/ps.c index c06d333..c1cb643 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -298,7 +298,7 @@ int ps_main(int argc, char **argv) #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 @@ int ps_main(int argc, char **argv) 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()) |