diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-23 00:34:42 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-23 00:34:42 +0200 |
| commit | 9e07219c7814972893d1f3bb67b43108fe83212a (patch) | |
| tree | 81352d21edcc0a021849fe9d4b0978e0595a60e1 /procps | |
| parent | 765b0eed3ef29a80115708c3249d3a541509cd24 (diff) | |
| download | busybox-w32-9e07219c7814972893d1f3bb67b43108fe83212a.tar.gz busybox-w32-9e07219c7814972893d1f3bb67b43108fe83212a.tar.bz2 busybox-w32-9e07219c7814972893d1f3bb67b43108fe83212a.zip | |
ps: make "ps -o BAD" emit list of good -o params
also make ps help more informative
function old new delta
find_out_spec 58 103 +45
packed_usage 27039 27079 +40
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/ps.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/procps/ps.c b/procps/ps.c index c3b200866..a3220a926 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
| @@ -232,7 +232,6 @@ static void func_tty(char *buf, int size, const procps_status_t *ps) | |||
| 232 | snprintf(buf, size+1, "%u,%u", ps->tty_major, ps->tty_minor); | 232 | snprintf(buf, size+1, "%u,%u", ps->tty_major, ps->tty_minor); |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | |||
| 236 | #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS | 235 | #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS |
| 237 | 236 | ||
| 238 | static void func_rgroup(char *buf, int size, const procps_status_t *ps) | 237 | static void func_rgroup(char *buf, int size, const procps_status_t *ps) |
| @@ -250,9 +249,10 @@ static void func_nice(char *buf, int size, const procps_status_t *ps) | |||
| 250 | sprintf(buf, "%*d", size, ps->niceness); | 249 | sprintf(buf, "%*d", size, ps->niceness); |
| 251 | } | 250 | } |
| 252 | 251 | ||
| 253 | #endif /* FEATURE_PS_ADDITIONAL_COLUMNS */ | 252 | #endif |
| 254 | 253 | ||
| 255 | #if ENABLE_FEATURE_PS_TIME | 254 | #if ENABLE_FEATURE_PS_TIME |
| 255 | |||
| 256 | static void func_etime(char *buf, int size, const procps_status_t *ps) | 256 | static void func_etime(char *buf, int size, const procps_status_t *ps) |
| 257 | { | 257 | { |
| 258 | /* elapsed time [[dd-]hh:]mm:ss; here only mm:ss */ | 258 | /* elapsed time [[dd-]hh:]mm:ss; here only mm:ss */ |
| @@ -278,6 +278,7 @@ static void func_time(char *buf, int size, const procps_status_t *ps) | |||
| 278 | mm /= 60; | 278 | mm /= 60; |
| 279 | snprintf(buf, size+1, "%3lu:%02u", mm, ss); | 279 | snprintf(buf, size+1, "%3lu:%02u", mm, ss); |
| 280 | } | 280 | } |
| 281 | |||
| 281 | #endif | 282 | #endif |
| 282 | 283 | ||
| 283 | #if ENABLE_SELINUX | 284 | #if ENABLE_SELINUX |
| @@ -337,11 +338,24 @@ static ps_out_t* new_out_t(void) | |||
| 337 | static const ps_out_t* find_out_spec(const char *name) | 338 | static const ps_out_t* find_out_spec(const char *name) |
| 338 | { | 339 | { |
| 339 | unsigned i; | 340 | unsigned i; |
| 341 | #if ENABLE_DESKTOP | ||
| 342 | char buf[ARRAY_SIZE(out_spec)*7 + 1]; | ||
| 343 | char *p = buf; | ||
| 344 | #endif | ||
| 345 | |||
| 340 | for (i = 0; i < ARRAY_SIZE(out_spec); i++) { | 346 | for (i = 0; i < ARRAY_SIZE(out_spec); i++) { |
| 341 | if (!strncmp(name, out_spec[i].name6, 6)) | 347 | if (strncmp(name, out_spec[i].name6, 6) == 0) |
| 342 | return &out_spec[i]; | 348 | return &out_spec[i]; |
| 349 | #if ENABLE_DESKTOP | ||
| 350 | p += sprintf(p, "%.6s,", out_spec[i].name6); | ||
| 351 | #endif | ||
| 343 | } | 352 | } |
| 344 | bb_error_msg_and_die("bad -o argument '%s'", name); | 353 | #if ENABLE_DESKTOP |
| 354 | p[-1] = '\0'; | ||
| 355 | bb_error_msg_and_die("bad -o argument '%s', supported arguments: %s", name, buf); | ||
| 356 | #else | ||
| 357 | bb_error_msg_and_die("bad -o argument '%s'"); | ||
| 358 | #endif | ||
| 345 | } | 359 | } |
| 346 | 360 | ||
| 347 | static void parse_o(char* opt) | 361 | static void parse_o(char* opt) |