emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix read_cmdline API and a small buglet where "[comm]" may be too narrow

Browse Source 
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>
This commit is contained in:
Denys Vlasenko 2009-09-12 00:15:34 +02:00
parent ae357bd713
commit 3a0f6f2328
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libbb.h
View File

@ -1359,9 +1359,9 @@ enum {
//procps_status_t* alloc_procps_scan(void) FAST_FUNC; //procps_status_t* alloc_procps_scan(void) FAST_FUNC;
void free_procps_scan(procps_status_t* sp) FAST_FUNC; void free_procps_scan(procps_status_t* sp) FAST_FUNC;
procps_status_t* procps_scan(procps_status_t* sp, int flags) FAST_FUNC; procps_status_t* procps_scan(procps_status_t* sp, int flags) FAST_FUNC;
/* Format cmdline (up to col chars) into char buf[col+1] */ /* Format cmdline (up to col chars) into char buf[size] */
/* Puts [comm] if cmdline is empty (-> process is a kernel thread) */ /* Puts [comm] if cmdline is empty (-> process is a kernel thread) */
void read_cmdline(char *buf, int col, unsigned pid, const char *comm) FAST_FUNC; void read_cmdline(char *buf, int size, unsigned pid, const char *comm) FAST_FUNC;
pid_t *find_pid_by_name(const char* procName) FAST_FUNC; pid_t *find_pid_by_name(const char* procName) FAST_FUNC;
pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC; pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC;

7
libbb/procps.c
View File

@ -464,18 +464,19 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm) void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
{ {
ssize_t sz; int sz;
char filename[sizeof("/proc//cmdline") + sizeof(int)*3]; char filename[sizeof("/proc//cmdline") + sizeof(int)*3];
sprintf(filename, "/proc/%u/cmdline", pid); sprintf(filename, "/proc/%u/cmdline", pid);
sz = open_read_close(filename, buf, col); sz = open_read_close(filename, buf, col - 1);
if (sz > 0) { if (sz > 0) {
buf[sz] = '\0'; buf[sz] = '\0';
while (--sz >= 0 && buf[sz] == '\0') while (--sz >= 0 && buf[sz] == '\0')
continue; continue;
while (--sz >= 0) do {
if ((unsigned char)(buf[sz]) < ' ') if ((unsigned char)(buf[sz]) < ' ')
buf[sz] = ' '; buf[sz] = ' ';
} while (--sz >= 0);
} else { } else {
snprintf(buf, col, "[%s]", comm); snprintf(buf, col, "[%s]", comm);
} }

2
procps/ps.c
View File

@ -186,7 +186,7 @@ static void func_comm(char *buf, int size, const procps_status_t *ps)
static void func_args(char *buf, int size, const procps_status_t *ps) static void func_args(char *buf, int size, const procps_status_t *ps)
{ {
read_cmdline(buf, size, ps->pid, ps->comm); read_cmdline(buf, size+1, ps->pid, ps->comm);
} }
static void func_pid(char *buf, int size, const procps_status_t *ps) static void func_pid(char *buf, int size, const procps_status_t *ps)

2
procps/top.c
View File

@ -617,7 +617,7 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
#endif #endif
); );
if ((int)(col + 1) < scr_width) if ((int)(col + 1) < scr_width)
read_cmdline(line_buf + col, scr_width - col - 1, s->pid, s->comm); read_cmdline(line_buf + col, scr_width - col, s->pid, s->comm);
fputs(line_buf, stdout); fputs(line_buf, stdout);
/* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu, /* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu,
cur_jif.busy - prev_jif.busy, cur_jif.total - prev_jif.total); */ cur_jif.busy - prev_jif.busy, cur_jif.total - prev_jif.total); */