ftpd: add support for MDTM, I see clients often use it,
[oweals/busybox.git] / procps / ps.c
index e18bd2a58ea416dec6c4cc9f2ef8863ef3d205de..395cfcf565aa899ee8b1a38d20c611c3e58bf18a 100644 (file)
  * Mini ps implementation(s) for busybox
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ * Fix for SELinux Support:(c)2007 Hiroshi Shinji <shiroshi@my.email.ne.jp>
+ *                         (c)2007 Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
  * Licensed under the GPL version 2, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
+
+/* Absolute maximum on output line length */
+enum { MAX_WIDTH = 2*1024 };
 
 #if ENABLE_DESKTOP
 
+#include <sys/times.h> /* for times() */
+//#include <sys/sysinfo.h> /* for sysinfo() */
+#ifndef AT_CLKTCK
+#define AT_CLKTCK 17
+#endif
+
+
+#if ENABLE_SELINUX
+#define SELINUX_O_PREFIX "label,"
+#define DEFAULT_O_STR    (SELINUX_O_PREFIX "pid,user" USE_FEATURE_PS_TIME(",time") ",args")
+#else
+#define DEFAULT_O_STR    ("pid,user" USE_FEATURE_PS_TIME(",time") ",args")
+#endif
+
+typedef struct {
+       uint16_t width;
+       char name[6];
+       const char *header;
+       void (*f)(char *buf, int size, const procps_status_t *ps);
+       int ps_flags;
+} ps_out_t;
+
+struct globals {
+       ps_out_t* out;
+       int out_cnt;
+       int print_header;
+       int need_flags;
+       char *buffer;
+       unsigned terminal_width;
+#if ENABLE_FEATURE_PS_TIME
+       unsigned kernel_HZ;
+       unsigned long long seconds_since_boot;
+#endif
+       char default_o[sizeof(DEFAULT_O_STR)];
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define out                (G.out               )
+#define out_cnt            (G.out_cnt           )
+#define print_header       (G.print_header      )
+#define need_flags         (G.need_flags        )
+#define buffer             (G.buffer            )
+#define terminal_width     (G.terminal_width    )
+#define kernel_HZ          (G.kernel_HZ         )
+#define seconds_since_boot (G.seconds_since_boot)
+#define default_o          (G.default_o         )
+
+#if ENABLE_FEATURE_PS_TIME
+/* for ELF executables, notes are pushed before environment and args */
+static ptrdiff_t find_elf_note(ptrdiff_t findme)
+{
+       ptrdiff_t *ep = (ptrdiff_t *) environ;
+
+       while (*ep++);
+       while (*ep) {
+               if (ep[0] == findme) {
+                       return ep[1];
+               }
+               ep += 2;
+       }
+       return -1;
+}
+
+#if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS
+static unsigned get_HZ_by_waiting(void)
+{
+       struct timeval tv1, tv2;
+       unsigned t1, t2, r, hz;
+       unsigned cnt = cnt; /* for compiler */
+       int diff;
+
+       r = 0;
+
+       /* Wait for times() to reach new tick */
+       t1 = times(NULL);
+       do {
+               t2 = times(NULL);
+       } while (t2 == t1);
+       gettimeofday(&tv2, NULL);
+
+       do {
+               t1 = t2;
+               tv1.tv_usec = tv2.tv_usec;
+
+               /* Wait exactly one times() tick */
+               do {
+                       t2 = times(NULL);
+               } while (t2 == t1);
+               gettimeofday(&tv2, NULL);
+
+               /* Calculate ticks per sec, rounding up to even */
+               diff = tv2.tv_usec - tv1.tv_usec;
+               if (diff <= 0) diff += 1000000;
+               hz = 1000000u / (unsigned)diff;
+               hz = (hz+1) & ~1;
+
+               /* Count how many same hz values we saw */
+               if (r != hz) {
+                       r = hz;
+                       cnt = 0;
+               }
+               cnt++;
+       } while (cnt < 3); /* exit if saw 3 same values */
+
+       return r;
+}
+#else
+static inline unsigned get_HZ_by_waiting(void)
+{
+       /* Better method? */
+       return 100;
+}
+#endif
+
+static unsigned get_kernel_HZ(void)
+{
+       //char buf[64];
+       struct sysinfo info;
+
+       if (kernel_HZ)
+               return kernel_HZ;
+
+       /* Works for ELF only, Linux 2.4.0+ */
+       kernel_HZ = find_elf_note(AT_CLKTCK);
+       if (kernel_HZ == (unsigned)-1)
+               kernel_HZ = get_HZ_by_waiting();
+
+       //if (open_read_close("/proc/uptime", buf, sizeof(buf) <= 0)
+       //      bb_perror_msg_and_die("cannot read %s", "/proc/uptime");
+       //buf[sizeof(buf)-1] = '\0';
+       ///sscanf(buf, "%llu", &seconds_since_boot);
+       sysinfo(&info);
+       seconds_since_boot = info.uptime;
+
+       return kernel_HZ;
+}
+#endif
+
 /* Print value to buf, max size+1 chars (including trailing '\0') */
 
-void func_user(char *buf, int size, const procps_status_t *ps)
+static void func_user(char *buf, int size, const procps_status_t *ps)
 {
+#if 1
        safe_strncpy(buf, get_cached_username(ps->uid), size+1);
+#else
+       /* "compatible" version, but it's larger */
+       /* procps 2.18 shows numeric UID if name overflows the field */
+       /* TODO: get_cached_username() returns numeric string if
+        * user has no passwd record, we will display it
+        * left-justified here; too long usernames are shown
+        * as _right-justified_ IDs. Is it worth fixing? */
+       const char *user = get_cached_username(ps->uid);
+       if (strlen(user) <= size)
+               safe_strncpy(buf, user, size+1);
+       else
+               sprintf(buf, "%*u", size, (unsigned)ps->uid);
+#endif
 }
 
-void func_comm(char *buf, int size, const procps_status_t *ps)
+static void func_comm(char *buf, int size, const procps_status_t *ps)
 {
        safe_strncpy(buf, ps->comm, size+1);
 }
 
-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)
 {
-       buf[0] = '\0';
-       if (ps->cmd)
-               safe_strncpy(buf, ps->cmd, size+1);
-       else if (size >= 2)
-               snprintf(buf, size+1, "[%.*s]", size-2, ps->comm);
+       read_cmdline(buf, size, ps->pid, ps->comm);
 }
 
-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)
 {
-       snprintf(buf, size+1, "%*u", size, ps->pid);
+       sprintf(buf, "%*u", size, ps->pid);
 }
 
-void func_ppid(char *buf, int size, const procps_status_t *ps)
+static void func_ppid(char *buf, int size, const procps_status_t *ps)
 {
-       snprintf(buf, size+1, "%*u", size, ps->ppid);
+       sprintf(buf, "%*u", size, ps->ppid);
 }
 
-void func_pgid(char *buf, int size, const procps_status_t *ps)
+static void func_pgid(char *buf, int size, const procps_status_t *ps)
 {
-       snprintf(buf, size+1, "%*u", size, ps->pgid);
+       sprintf(buf, "%*u", size, ps->pgid);
 }
 
-void func_rss(char *buf, int size, const procps_status_t *ps)
+static void put_lu(char *buf, int size, unsigned long u)
 {
-       char buf5[5];
-       smart_ulltoa5( ((unsigned long long)ps->rss) << 10, buf5);
-       snprintf(buf, size+1, "%.*s", size, buf5);
+       char buf4[5];
+
+       /* see http://en.wikipedia.org/wiki/Tera */
+       smart_ulltoa4(u, buf4, " mgtpezy");
+       buf4[4] = '\0';
+       sprintf(buf, "%.*s", size, buf4);
 }
 
-/*
-void func_nice(char *buf, int size, const procps_status_t *ps)
+static void func_vsz(char *buf, int size, const procps_status_t *ps)
 {
-       ps->???
+       put_lu(buf, size, ps->vsz);
 }
 
-void func_etime(char *buf, int size, const procps_status_t *ps)
+static void func_rss(char *buf, int size, const procps_status_t *ps)
 {
-       elapled time [[dd-]hh:]mm:ss
+       put_lu(buf, size, ps->rss);
 }
 
-void func_time(char *buf, int size, const procps_status_t *ps)
+static void func_tty(char *buf, int size, const procps_status_t *ps)
 {
-       cumulative time [[dd-]hh:]mm:ss
+       buf[0] = '?';
+       buf[1] = '\0';
+       if (ps->tty_major) /* tty field of "0" means "no tty" */
+               snprintf(buf, size+1, "%u,%u", ps->tty_major, ps->tty_minor);
 }
 
-void func_pcpu(char *buf, int size, const procps_status_t *ps)
+#if ENABLE_FEATURE_PS_TIME
+static void func_etime(char *buf, int size, const procps_status_t *ps)
 {
+       /* elapsed time [[dd-]hh:]mm:ss; here only mm:ss */
+       unsigned long mm;
+       unsigned ss;
+
+       mm = ps->start_time / get_kernel_HZ();
+       /* must be after get_kernel_HZ()! */
+       mm = seconds_since_boot - mm;
+       ss = mm % 60;
+       mm /= 60;
+       snprintf(buf, size+1, "%3lu:%02u", mm, ss);
 }
 
-void func_tty(char *buf, int size, const procps_status_t *ps)
+static void func_time(char *buf, int size, const procps_status_t *ps)
 {
+       /* cumulative time [[dd-]hh:]mm:ss; here only mm:ss */
+       unsigned long mm;
+       unsigned ss;
+
+       mm = (ps->utime + ps->stime) / get_kernel_HZ();
+       ss = mm % 60;
+       mm /= 60;
+       snprintf(buf, size+1, "%3lu:%02u", mm, ss);
 }
-*/
+#endif
 
-typedef struct {
-       char name[8];
-       const char *header;
-       void (*f)(char *buf, int size, const procps_status_t *ps);
-       int ps_flags;
-       int width;
-} ps_out_t;
+#if ENABLE_SELINUX
+static void func_label(char *buf, int size, const procps_status_t *ps)
+{
+       safe_strncpy(buf, ps->context ? ps->context : "unknown", size+1);
+}
+#endif
+
+/*
+static void func_nice(char *buf, int size, const procps_status_t *ps)
+{
+       ps->???
+}
+
+static void func_pcpu(char *buf, int size, const procps_status_t *ps)
+{
+}
+*/
 
 static const ps_out_t out_spec[] = {
 // Mandated by POSIX:
-       { "user"  ,"USER"   ,func_user  ,PSSCAN_UIDGID,8                   },
-       { "comm"  ,"COMMAND",func_comm  ,PSSCAN_COMM  ,16                  },
-       { "args"  ,"COMMAND",func_args  ,PSSCAN_CMD|PSSCAN_COMM,256        },
-       { "pid"   ,"PID"    ,func_pid   ,PSSCAN_PID   ,5                   },
-       { "ppid"  ,"PPID"   ,func_ppid  ,PSSCAN_PPID  ,5                   },
-       { "pgid"  ,"PGID"   ,func_pgid  ,PSSCAN_PGID  ,5                   },
-//     { "etime" ,"ELAPSED",func_etime ,PSSCAN_      ,sizeof("ELAPSED")-1 },
-//     { "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID,sizeof("GROUP"  )-1 },
-//     { "nice"  ,"NI"     ,func_nice  ,PSSCAN_      ,sizeof("NI"     )-1 },
-//     { "pcpu"  ,"%CPU"   ,func_pcpu  ,PSSCAN_      ,sizeof("%CPU"   )-1 },
-//     { "rgroup","RGROUP" ,func_rgroup,PSSCAN_UIDGID,sizeof("RGROUP" )-1 },
-//     { "ruser" ,"RUSER"  ,func_ruser ,PSSCAN_UIDGID,sizeof("RUSER"  )-1 },
-//     { "time"  ,"TIME"   ,func_time  ,PSSCAN_      ,sizeof("TIME"   )-1 },
-//     { "tty"   ,"TT"     ,func_tty   ,PSSCAN_      ,sizeof("TT"     )-1 },
-//     { "vsz"   ,"VSZ"    ,func_vsz   ,PSSCAN_VSZ   ,4                   },
-// Not mandated by POSIX:
-       { "rss"   ,"RSS"    ,func_rss   ,PSSCAN_RSS   ,4                   },
+       { 8                  , "user"  ,"USER"   ,func_user  ,PSSCAN_UIDGID  },
+       { 16                 , "comm"  ,"COMMAND",func_comm  ,PSSCAN_COMM    },
+       { 256                , "args"  ,"COMMAND",func_args  ,PSSCAN_COMM    },
+       { 5                  , "pid"   ,"PID"    ,func_pid   ,PSSCAN_PID     },
+       { 5                  , "ppid"  ,"PPID"   ,func_ppid  ,PSSCAN_PPID    },
+       { 5                  , "pgid"  ,"PGID"   ,func_pgid  ,PSSCAN_PGID    },
+#if ENABLE_FEATURE_PS_TIME
+       { sizeof("ELAPSED")-1, "etime" ,"ELAPSED",func_etime ,PSSCAN_START_TIME },
+#endif
+//     { sizeof("GROUP"  )-1, "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID  },
+//     { sizeof("NI"     )-1, "nice"  ,"NI"     ,func_nice  ,PSSCAN_        },
+//     { sizeof("%CPU"   )-1, "pcpu"  ,"%CPU"   ,func_pcpu  ,PSSCAN_        },
+//     { sizeof("RGROUP" )-1, "rgroup","RGROUP" ,func_rgroup,PSSCAN_UIDGID  },
+//     { sizeof("RUSER"  )-1, "ruser" ,"RUSER"  ,func_ruser ,PSSCAN_UIDGID  },
+#if ENABLE_FEATURE_PS_TIME
+       { 6                  , "time"  ,"TIME"   ,func_time  ,PSSCAN_STIME | PSSCAN_UTIME },
+#endif
+       { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
+       { 4                  , "vsz"   ,"VSZ"    ,func_vsz   ,PSSCAN_VSZ     },
+// Not mandated by POSIX, but useful:
+       { 4                  , "rss"   ,"RSS"    ,func_rss   ,PSSCAN_RSS     },
+#if ENABLE_SELINUX
+       { 35                 , "label" ,"LABEL"  ,func_label ,PSSCAN_CONTEXT },
+#endif
 };
 
-#define VEC_SIZE(v) ( sizeof(v) / sizeof((v)[0]) )
-
-static ps_out_t* out;
-static int out_cnt;
-static int print_header;
-static int ps_flags;
-static char *buffer;
-static unsigned terminal_width;
-
-
 static ps_out_t* new_out_t(void)
 {
-       int i = out_cnt++;
-       out = xrealloc(out, out_cnt * sizeof(*out));
-       return &out[i];
+       out = xrealloc_vector(out, 2, out_cnt);
+       return &out[out_cnt++];
 }
 
 static const ps_out_t* find_out_spec(const char *name)
 {
-       int i;
-       for (i = 0; i < VEC_SIZE(out_spec); i++) {
+       unsigned i;
+       for (i = 0; i < ARRAY_SIZE(out_spec); i++) {
                if (!strcmp(name, out_spec[i].name))
                        return &out_spec[i];
        }
@@ -152,6 +334,8 @@ static void parse_o(char* opt)
                }
                break;
        }
+       // opt points to last spec in comma separated list.
+       // This one can have =HEADER part.
        new = new_out_t();
        if (equal)
                *equal = '\0';
@@ -177,12 +361,16 @@ static void post_process(void)
        int i;
        int width = 0;
        for (i = 0; i < out_cnt; i++) {
-               ps_flags |= out[i].ps_flags;
+               need_flags |= out[i].ps_flags;
                if (out[i].header[0]) {
                        print_header = 1;
                }
                width += out[i].width + 1; /* "FIELD " */
        }
+#if ENABLE_SELINUX
+       if (!is_selinux_enabled())
+               need_flags &= ~PSSCAN_CONTEXT;
+#endif
        buffer = xmalloc(width + 1); /* for trailing \0 */
 }
 
@@ -190,9 +378,11 @@ static void format_header(void)
 {
        int i;
        ps_out_t* op;
-       char *p = buffer;
+       char *p;
+
        if (!print_header)
                return;
+       p = buffer;
        i = 0;
        if (out_cnt) {
                while (1) {
@@ -216,29 +406,26 @@ static void format_process(const procps_status_t *ps)
                // POSIX: Any field need not be meaningful in all
                // implementations. In such a case a hyphen ( '-' )
                // should be output in place of the field value.
-               if (!*p) {
-                       *p++ = '-';
-                       *p = '\0';
+               if (!p[0]) {
+                       p[0] = '-';
+                       p[1] = '\0';
                }
                len = strlen(p);
                p += len;
                len = out[i].width - len + 1;
                if (++i == out_cnt) /* do not pad last field */
                        break;
-               while (len--)
-                       *p++ = ' ';
-               *p = '\0';
+               p += sprintf(p, "%*s", len, "");
        }
        printf("%.*s\n", terminal_width, buffer);
 }
 
-/* Cannot be const: parse_o() will choke */
-static char default_o[] = "pid,user" /* TODO: ,vsz,stat */ ",args";
-
-int ps_main(int argc, char **argv)
+int ps_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ps_main(int argc UNUSED_PARAM, char **argv)
 {
        procps_status_t *p;
        llist_t* opt_o = NULL;
+       USE_SELINUX(int opt;)
 
        // POSIX:
        // -a  Write information for all processes associated with terminals
@@ -249,29 +436,41 @@ int ps_main(int argc, char **argv)
        // -f  Generate a full listing
        // -l  Generate a long listing
        // -o col1,col2,col3=header
-       //     Select which columns to distplay
+       //     Select which columns to display
        /* We allow (and ignore) most of the above. FIXME */
        opt_complementary = "o::";
-       getopt32(argc, argv, "o:aAdefl", &opt_o);
+       USE_SELINUX(opt =) getopt32(argv, "Zo:aAdefl", &opt_o);
        if (opt_o) {
-               opt_o = rev_llist(opt_o);
                do {
-                       parse_o(opt_o->data);
-                       opt_o = opt_o->link;
+                       parse_o(llist_pop(&opt_o));
                } while (opt_o);
-       } else
+       } else {
+               /* Below: parse_o() needs char*, NOT const char*... */
+#if ENABLE_SELINUX
+               if (!(opt & 1) || !is_selinux_enabled()) {
+                       /* no -Z or no SELinux: do not show LABEL */
+                       strcpy(default_o, DEFAULT_O_STR + sizeof(SELINUX_O_PREFIX)-1);
+               } else
+#endif
+               {
+                       strcpy(default_o, DEFAULT_O_STR);
+               }
                parse_o(default_o);
+       }
        post_process();
 
-       terminal_width = INT_MAX;
+       /* Was INT_MAX, but some libc's go belly up with printf("%.*s")
+        * and such large widths */
+       terminal_width = MAX_WIDTH;
        if (isatty(1)) {
-               get_terminal_width_height(1, &terminal_width, NULL);
-               terminal_width--;
+               get_terminal_width_height(0, &terminal_width, NULL);
+               if (--terminal_width > MAX_WIDTH)
+                       terminal_width = MAX_WIDTH;
        }
        format_header();
 
        p = NULL;
-       while ((p = procps_scan(p, ps_flags))) {
+       while ((p = procps_scan(p, need_flags))) {
                format_process(p);
        }
 
@@ -282,102 +481,85 @@ int ps_main(int argc, char **argv)
 #else /* !ENABLE_DESKTOP */
 
 
-int ps_main(int argc, char **argv)
+int ps_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
        procps_status_t *p = NULL;
-       int i, len;
+       int len;
        SKIP_SELINUX(const) int use_selinux = 0;
-       USE_SELINUX(security_context_t sid = NULL;)
+       USE_SELINUX(int i;)
 #if !ENABLE_FEATURE_PS_WIDE
        enum { terminal_width = 79 };
 #else
-       int terminal_width;
+       unsigned terminal_width;
        int w_count = 0;
 #endif
 
 #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
 #if ENABLE_FEATURE_PS_WIDE
        opt_complementary = "-:ww";
-       USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("c") "w", &w_count);
+       USE_SELINUX(i =) getopt32(argv, USE_SELINUX("Z") "w", &w_count);
        /* if w is given once, GNU ps sets the width to 132,
         * if w is given more than once, it is "unlimited"
         */
        if (w_count) {
-               terminal_width = (w_count==1) ? 132 : INT_MAX;
+               terminal_width = (w_count==1) ? 132 : MAX_WIDTH;
        } else {
-               get_terminal_width_height(1, &terminal_width, NULL);
+               get_terminal_width_height(0, &terminal_width, NULL);
                /* Go one less... */
-               terminal_width--;
+               if (--terminal_width > MAX_WIDTH)
+                       terminal_width = MAX_WIDTH;
        }
 #else /* only ENABLE_SELINUX */
-       i = getopt32(argc, argv, "c");
+       i = getopt32(argv, "Z");
 #endif
 #if ENABLE_SELINUX
        if ((i & 1) && is_selinux_enabled())
-               use_selinux = 1;
+               use_selinux = PSSCAN_CONTEXT;
 #endif
 #endif /* ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX */
 
        if (use_selinux)
-               puts("  PID Context                          Stat Command");
+               puts("  PID CONTEXT                          STAT COMMAND");
        else
-               puts("  PID  Uid     VmSize Stat Command");
+               puts("  PID USER       VSZ STAT COMMAND");
 
        while ((p = procps_scan(p, 0
                        | PSSCAN_PID
                        | PSSCAN_UIDGID
                        | PSSCAN_STATE
-                       | PSSCAN_RSS
-                       | PSSCAN_CMD
+                       | PSSCAN_VSZ
+                       | PSSCAN_COMM
+                       | use_selinux
        ))) {
-               char *namecmd = p->cmd;
 #if ENABLE_SELINUX
                if (use_selinux) {
-                       char sbuf[128];
-                       len = sizeof(sbuf);
-
-                       if (is_selinux_enabled()) {
-                               if (getpidcon(p->pid, &sid) < 0)
-                                       sid = NULL;
-                       }
-
-                       if (sid) {
-                               /* I assume sid initialized with NULL */
-                               len = strlen(sid) + 1;
-                               safe_strncpy(sbuf, sid, len);
-                               freecon(sid);
-                               sid = NULL;
-                       } else {
-                               safe_strncpy(sbuf, "unknown", 7);
-                       }
-                       len = printf("%5u %-32s %s ", p->pid, sbuf, p->state);
+                       len = printf("%5u %-32.32s %s  ",
+                                       p->pid,
+                                       p->context ? p->context : "unknown",
+                                       p->state);
                } else
 #endif
                {
                        const char *user = get_cached_username(p->uid);
-                       if (p->rss == 0)
-                               len = printf("%5u %-8s        %s ",
-                                       p->pid, user, p->state);
-                       else
-                               len = printf("%5u %-8s %6ld %s ",
-                                       p->pid, user, p->rss, p->state);
+                       //if (p->vsz == 0)
+                       //      len = printf("%5u %-8.8s        %s ",
+                       //              p->pid, user, p->state);
+                       //else
+                       {
+                               char buf6[6];
+                               smart_ulltoa5(p->vsz, buf6, " mgtpezy");
+                               buf6[5] = '\0';
+                               len = printf("%5u %-8.8s %s %s  ",
+                                       p->pid, user, buf6, p->state);
+                       }
                }
 
-               i = terminal_width-len;
-
-               if (namecmd && namecmd[0]) {
-                       if (i < 0)
-                               i = 0;
-                       if (strlen(namecmd) > (size_t)i)
-                               namecmd[i] = 0;
-                       puts(namecmd);
-               } else {
-                       namecmd = p->comm;
-                       if (i < 2)
-                               i = 2;
-                       if (strlen(namecmd) > ((size_t)i-2))
-                               namecmd[i-2] = 0;
-                       printf("[%s]\n", namecmd);
+               {
+                       int sz = terminal_width - len;
+                       char buf[sz + 1];
+                       read_cmdline(buf, sz, p->pid, p->comm);
+                       puts(buf);
                }
        }
        if (ENABLE_FEATURE_CLEAN_UP)