diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-12 00:15:34 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-09-12 00:15:34 +0200 |
commit | 3a0f6f23286ad4352830613c6a8aea1bd56ca2d2 (patch) | |
tree | 6781fe0614bf8a544550535abca7897468bae970 /libbb | |
parent | ae357bd7138a179a1433b7d6e1aca48cc6438966 (diff) | |
download | busybox-w32-3a0f6f23286ad4352830613c6a8aea1bd56ca2d2.tar.gz busybox-w32-3a0f6f23286ad4352830613c6a8aea1bd56ca2d2.tar.bz2 busybox-w32-3a0f6f23286ad4352830613c6a8aea1bd56ca2d2.zip |
fix read_cmdline API and a small buglet where "[comm]" may be too narrow
function old new delta
func_args 25 26 +1
read_cmdline 119 114 -5
display_process_list 1462 1447 -15
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/2 up/down: 1/-20) Total: -19 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/procps.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libbb/procps.c b/libbb/procps.c index 9a8e42df7..974661785 100644 --- a/libbb/procps.c +++ b/libbb/procps.c | |||
@@ -464,18 +464,19 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags) | |||
464 | 464 | ||
465 | void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm) | 465 | void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm) |
466 | { | 466 | { |
467 | ssize_t sz; | 467 | int sz; |
468 | char filename[sizeof("/proc//cmdline") + sizeof(int)*3]; | 468 | char filename[sizeof("/proc//cmdline") + sizeof(int)*3]; |
469 | 469 | ||
470 | sprintf(filename, "/proc/%u/cmdline", pid); | 470 | sprintf(filename, "/proc/%u/cmdline", pid); |
471 | sz = open_read_close(filename, buf, col); | 471 | sz = open_read_close(filename, buf, col - 1); |
472 | if (sz > 0) { | 472 | if (sz > 0) { |
473 | buf[sz] = '\0'; | 473 | buf[sz] = '\0'; |
474 | while (--sz >= 0 && buf[sz] == '\0') | 474 | while (--sz >= 0 && buf[sz] == '\0') |
475 | continue; | 475 | continue; |
476 | while (--sz >= 0) | 476 | do { |
477 | if ((unsigned char)(buf[sz]) < ' ') | 477 | if ((unsigned char)(buf[sz]) < ' ') |
478 | buf[sz] = ' '; | 478 | buf[sz] = ' '; |
479 | } while (--sz >= 0); | ||
479 | } else { | 480 | } else { |
480 | snprintf(buf, col, "[%s]", comm); | 481 | snprintf(buf, col, "[%s]", comm); |
481 | } | 482 | } |