wmesg - Increase to 8 chars from 7

* Increase top from 7 to 8 and use the WMESGLEN define in ps (previously 6).

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index cfcb50e..f08146d 100644 (file)
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -36,6 +36,7 @@
  */
 
 #include <sys/user.h>
+#include <sys/kinfo.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/queue.h>
@@ -202,7 +203,7 @@ static const VAR var[] = {
        {"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN, 0, 0, NULL, NULL},
        {"vsize", "", "vsz", 0, 0, NULL, 0, 0, 0, NULL, NULL},
        {"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, 0, NULL, NULL},
-       {"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, 0, NULL, NULL},
+       {"wchan", "WCHAN", NULL, LJUST, wchan, NULL, WMESGLEN, 0, 0, NULL, NULL},
        {"xstat", "XSTAT", NULL, 0, pvar, NULL, 7, POFF(exitstat), USHORT, "x", NULL},
        {"", NULL, NULL, 0, NULL, NULL, 0, 0, 0, NULL, NULL},
 };

diff --git a/sys/sys/kinfo.h b/sys/sys/kinfo.h
index 4c23681..6fcd4db 100644 (file)
--- a/sys/sys/kinfo.h
+++ b/sys/sys/kinfo.h
@@ -140,7 +140,7 @@ struct kinfo_lwp {
 
        sigset_t        kl_siglist;     /* pending signals */
        sigset_t        kl_sigmask;     /* masked signals */
-#define WMESGLEN 7
+#define WMESGLEN 8
        uintptr_t       kl_wchan;       /* waiting channel */
        char            kl_wmesg[WMESGLEN+1];   /* waiting message */
 };

diff --git a/usr.bin/top/m_dragonfly.c b/usr.bin/top/m_dragonfly.c
index 2a883d2..d45e50b 100644 (file)
--- a/usr.bin/top/m_dragonfly.c
+++ b/usr.bin/top/m_dragonfly.c
@@ -90,16 +90,16 @@ struct handle {
  */
 
 static char smp_header[] =
-"  PID %-*.*s NICE  SIZE   PRES   STATE CPU  TIME   CTIME    CPU COMMAND";
+"  PID %-*.*s NICE  SIZE   PRES    STATE CPU  TIME   CTIME    CPU COMMAND";
 
 #define smp_Proc_format \
-       "%5d %-*.*s %3d%7s %6s %7.7s %2d %6s %7s %5.2f%% %.*s"
+       "%5d %-*.*s %3d%7s %6s %8.8s %2d %6s %7s %5.2f%% %.*s"
 
 static char up_header[] =
-"  PID %-*.*s NICE  SIZE   PRES   STATE    TIME   CTIME    CPU COMMAND";
+"  PID %-*.*s NICE  SIZE   PRES    STATE    TIME   CTIME    CPU COMMAND";
 
 #define up_Proc_format \
-       "%5d %-*.*s %3d%7s %6s %7.7s%.0d %7s %7s %5.2f%% %.*s"
+       "%5d %-*.*s %3d%7s %6s %8.8s%.0d %7s %7s %5.2f%% %.*s"
 
 
 /* process state names for the "STATE" column of the display */
@@ -577,7 +577,7 @@ format_next_process(caddr_t xhandle, char *(*get_userid) (int))
                break;
        case LSSLEEP:
                if (LP(pp, wmesg) != NULL) {
-                       sprintf(status, "%.6s", LP(pp, wmesg));
+                       sprintf(status, "%.8s", LP(pp, wmesg)); /* WMESGLEN */
                        break;
                }
                /* fall through */