aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-02-02 13:04:30 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-02-02 13:04:30 +0100
commitb6871c1965af0eb87123e13f5d81ec0c9b801b71 (patch)
tree6c3d9145cf4073b8016eeccf2232e1b165a8388e
parentb1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556 (diff)
downloadbusybox-w32-b6871c1965af0eb87123e13f5d81ec0c9b801b71.tar.gz
busybox-w32-b6871c1965af0eb87123e13f5d81ec0c9b801b71.tar.bz2
busybox-w32-b6871c1965af0eb87123e13f5d81ec0c9b801b71.zip
ps: avoid -o stat to contain spaces. Closes 9631
function old new delta procps_scan 1227 1236 +9 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/procps.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/libbb/procps.c b/libbb/procps.c
index 4edc54d48..b52c0f51b 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -370,6 +370,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
370 | PSSCAN_TTY | PSSCAN_NICE 370 | PSSCAN_TTY | PSSCAN_NICE
371 | PSSCAN_CPU) 371 | PSSCAN_CPU)
372 ) { 372 ) {
373 int s_idx;
373 char *cp, *comm1; 374 char *cp, *comm1;
374 int tty; 375 int tty;
375#if !ENABLE_FEATURE_FAST_TOP 376#if !ENABLE_FEATURE_FAST_TOP
@@ -468,17 +469,20 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
468#if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS 469#if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
469 sp->niceness = tasknice; 470 sp->niceness = tasknice;
470#endif 471#endif
471 472 sp->state[1] = ' ';
472 if (sp->vsz == 0 && sp->state[0] != 'Z') 473 sp->state[2] = ' ';
474 s_idx = 1;
475 if (sp->vsz == 0 && sp->state[0] != 'Z') {
476 /* not sure what the purpose of this flag */
473 sp->state[1] = 'W'; 477 sp->state[1] = 'W';
474 else 478 s_idx = 2;
475 sp->state[1] = ' '; 479 }
476 if (tasknice < 0) 480 if (tasknice != 0) {
477 sp->state[2] = '<'; 481 if (tasknice < 0)
478 else if (tasknice) /* > 0 */ 482 sp->state[s_idx] = '<';
479 sp->state[2] = 'N'; 483 else /* > 0 */
480 else 484 sp->state[s_idx] = 'N';
481 sp->state[2] = ' '; 485 }
482 } 486 }
483 487
484#if ENABLE_FEATURE_TOPMEM 488#if ENABLE_FEATURE_TOPMEM