ps: Add the comm keyword which is an alias for ucomm.

While I'm here, don't pad the output of ucomm if it's the last column.

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index da9c837..85d7fe6 100644 (file)
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -87,6 +87,8 @@ static const VAR var[] = {
        {"batch", "BAT", NULL, 0, lpest, NULL, 3, LPOFF(origcpu), UINT, "d", NULL},
        {"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, 0, NULL, NULL},
        {"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, 0, NULL, NULL},
+       {"comm", "COMMAND", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR,
+               NULL, 0},
        {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, 0, NULL,
                NULL},
        {"cpu", "CPU", NULL, 0, lpest, NULL, 3, LPOFF(estcpu), UINT, "d", NULL},

diff --git a/bin/ps/print.c b/bin/ps/print.c
index 2794b46..f7bb1a4 100644 (file)
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -165,7 +165,11 @@ command(const KINFO *k, const struct varent *vent)
 void
 ucomm(const KINFO *k, const struct varent *vent)
 {
-       printf("%-*s", vent->width, make_printable(KI_PROC(k, comm)));
+       /* Do not pad the last field */
+       if (STAILQ_NEXT(vent, link) == NULL)
+               printf("%s", make_printable(KI_PROC(k, comm)));
+       else
+               printf("%-*s", vent->width, make_printable(KI_PROC(k, comm)));
 }
 
 void