diff options
| author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-10-04 17:09:50 +0000 |
|---|---|---|
| committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-10-04 17:09:50 +0000 |
| commit | 9c44dce304150753879269b982f3e2c55c6bb287 (patch) | |
| tree | 8842df697837607431fb2abd54342b76aa7a115f /procps | |
| parent | be0ed3d0b94489e08cc9280f65075c42ba80bf8c (diff) | |
| download | busybox-w32-9c44dce304150753879269b982f3e2c55c6bb287.tar.gz busybox-w32-9c44dce304150753879269b982f3e2c55c6bb287.tar.bz2 busybox-w32-9c44dce304150753879269b982f3e2c55c6bb287.zip | |
ps selinux logic correction, but do not tested too
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/ps.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/procps/ps.c b/procps/ps.c index a0081c839..6b5a4a908 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
| @@ -33,6 +33,7 @@ extern int ps_main(int argc, char **argv) | |||
| 33 | #if ENABLE_FEATURE_PS_WIDE | 33 | #if ENABLE_FEATURE_PS_WIDE |
| 34 | int terminal_width; | 34 | int terminal_width; |
| 35 | int w_count = 0; | 35 | int w_count = 0; |
| 36 | bb_opt_complementally="ww"; | ||
| 36 | #else | 37 | #else |
| 37 | # define terminal_width 80 | 38 | # define terminal_width 80 |
| 38 | #endif | 39 | #endif |
| @@ -40,12 +41,10 @@ extern int ps_main(int argc, char **argv) | |||
| 40 | #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX | 41 | #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX |
| 41 | /* handle arguments */ | 42 | /* handle arguments */ |
| 42 | #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX | 43 | #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX |
| 43 | bb_opt_complementally="ww"; | ||
| 44 | i = bb_getopt_ulflags(argc, argv, "wc", &w_count); | 44 | i = bb_getopt_ulflags(argc, argv, "wc", &w_count); |
| 45 | #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX | 45 | #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX |
| 46 | bb_opt_complementally="ww"; | ||
| 47 | i = bb_getopt_ulflags(argc, argv, "w", &w_count); | 46 | i = bb_getopt_ulflags(argc, argv, "w", &w_count); |
| 48 | #else /* !ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX */ | 47 | #else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */ |
| 49 | i = bb_getopt_ulflags(argc, argv, "c"); | 48 | i = bb_getopt_ulflags(argc, argv, "c"); |
| 50 | #endif | 49 | #endif |
| 51 | #if ENABLE_FEATURE_PS_WIDE | 50 | #if ENABLE_FEATURE_PS_WIDE |
| @@ -61,7 +60,7 @@ extern int ps_main(int argc, char **argv) | |||
| 61 | } | 60 | } |
| 62 | #endif | 61 | #endif |
| 63 | #if ENABLE_SELINUX | 62 | #if ENABLE_SELINUX |
| 64 | if ((i & 2) && is_selinux_enabled()) | 63 | if ((i & (1+ENABLE_FEATURE_PS_WIDE)) && is_selinux_enabled()) |
| 65 | use_selinux = 1; | 64 | use_selinux = 1; |
| 66 | #endif | 65 | #endif |
| 67 | #endif /* ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX */ | 66 | #endif /* ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX */ |