diff options
author | Ron Yorston <rmy@pobox.com> | 2021-10-13 14:37:51 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-10-13 14:37:51 +0100 |
commit | 0ecf1aea459571b48dc68ddc2b7b9265740fa960 (patch) | |
tree | 491d6184a44b8b525a4ca35759d622aecd7f6344 /procps/ps.c | |
parent | 4859ddcb20616718efbea12c6bf8b27c469b68de (diff) | |
parent | aaf3d5ba74c5da97ff80b61f30cb8dd225d39096 (diff) | |
download | busybox-w32-0ecf1aea459571b48dc68ddc2b7b9265740fa960.tar.gz busybox-w32-0ecf1aea459571b48dc68ddc2b7b9265740fa960.tar.bz2 busybox-w32-0ecf1aea459571b48dc68ddc2b7b9265740fa960.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/ps.c')
-rw-r--r-- | procps/ps.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/procps/ps.c b/procps/ps.c index 801a6fdf3..4c6e07e8b 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -451,17 +451,19 @@ static void parse_o(char* opt) | |||
451 | opt = comma + 1; | 451 | opt = comma + 1; |
452 | continue; | 452 | continue; |
453 | } | 453 | } |
454 | break; | 454 | // opt points to last spec in comma separated list. |
455 | } | 455 | // This one can have =HEADER part. |
456 | // opt points to last spec in comma separated list. | 456 | new = new_out_t(); |
457 | // This one can have =HEADER part. | 457 | if (equal) |
458 | new = new_out_t(); | 458 | *equal = '\0'; |
459 | if (equal) | 459 | *new = *find_out_spec(opt); |
460 | *equal = '\0'; | 460 | if (!equal) |
461 | *new = *find_out_spec(opt); | 461 | break; |
462 | if (equal) { | 462 | *equal++ = '='; |
463 | *equal = '='; | 463 | new->header = equal; |
464 | new->header = equal + 1; | 464 | comma = strchr(equal, ','); |
465 | if (comma) | ||
466 | *comma = '\0'; | ||
465 | // POSIX: the field widths shall be ... at least as wide as | 467 | // POSIX: the field widths shall be ... at least as wide as |
466 | // the header text (default or overridden value). | 468 | // the header text (default or overridden value). |
467 | // If the header text is null, such as -o user=, | 469 | // If the header text is null, such as -o user=, |
@@ -469,10 +471,12 @@ static void parse_o(char* opt) | |||
469 | // default header text | 471 | // default header text |
470 | if (new->header[0]) { | 472 | if (new->header[0]) { |
471 | new->width = strlen(new->header); | 473 | new->width = strlen(new->header); |
472 | print_header = 1; | ||
473 | } | 474 | } |
474 | } else | 475 | if (!comma) |
475 | print_header = 1; | 476 | break; |
477 | //*comma = ','; /* no, new->header should stay NUL-terminated */ | ||
478 | opt = comma + 1; | ||
479 | } | ||
476 | } | 480 | } |
477 | 481 | ||
478 | static void alloc_line_buffer(void) | 482 | static void alloc_line_buffer(void) |