From 70599c3d3f1b227bbc29e77b29a4c7f4644fff93 Mon Sep 17 00:00:00 2001 From: albert <> Date: Sat, 21 Dec 2002 14:13:33 +0000 Subject: [PATCH] last bits --- NEWS | 2 +- pgrep.c | 3 ++- top.c | 23 ----------------------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index c284abcd..4db71ac4 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ procps-3.1.4 --> procps-3.1.5 ancient (2.x.xx era) data corruption fixed serious hidden-process problem (3.1.3+) fixed -escape sequence vulnerability fixed +w: escape sequence vulnerability fixed procps-3.1.3 --> procps-3.1.4 diff --git a/pgrep.c b/pgrep.c index 6ebbada5..8ba1c65b 100644 --- a/pgrep.c +++ b/pgrep.c @@ -273,6 +273,7 @@ output_numlist (const union el *restrict list) static void output_strlist (const union el *restrict list) { +// FIXME: escape codes int i; for (i = 1; i < list[0].num; i++) printf ("%s%s", list[i].str, opt_delim); @@ -447,7 +448,7 @@ select_procs (void) matches = 0; } if (opt_long) { - char buff[4096]; + char buff[5096]; // FIXME sprintf (buff, "%d %s", task.pid, cmd); list[++matches].str = strdup (buff); } else { diff --git a/top.c b/top.c index b49e9a56..f19fee3e 100644 --- a/top.c +++ b/top.c @@ -2892,29 +2892,6 @@ static void task_show (const WIN_t *q, const proc_t *p) unsigned w = Fieldstab[i].width; switch (i) { -#if 0 - case P_CMD: - { const char *cp; - if (CHKw(q, Show_CMDLIN)) { - char tmp[ROWBUFSIZ]; - char *tp; - if (p->cmdline) { - j = 0; - *(tp = tmp) = '\0'; - do { - tp = scat(tp, fmtmk("%.*s ", q->maxcmdln, p->cmdline[j])); - if (q->maxcmdln < (tp - tmp)) break; - } while (p->cmdline[++j]); - strim_1(tmp); - } else - strcpy(tmp, fmtmk("[%s]", p->cmd)); - cp = tmp; - } else - cp = p->cmd; - MKCOL(q->maxcmdln, q->maxcmdln, cp); - } - break; -#endif case P_CMD: { char tmp[ROWBUFSIZ]; unsigned flags;