From 8ede8cbc50db26af14b89e19b9b8fb31ccecca26 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue, 13 Aug 2002 11:06:54 +0000
Subject: [PATCH] Realign columns in DDB's ps output.  Don't waste more
 horizontal space than necessary.

---
 sys/ddb/db_ps.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 996e4eb10dfb..05c0778159d9 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -62,7 +62,7 @@ db_ps(dummy1, dummy2, dummy3, dummy4)
 	else
 		p = &proc0;
 
-	db_printf("  pid   proc     addr    uid  ppid  pgrp  flag  stat wmesg   wchan   cmd\n");
+	db_printf("  pid   proc     addr    uid  ppid  pgrp  flag   stat  wmesg    wchan  cmd\n");
 	while (--np >= 0) {
 		/*
 		 * XXX just take 20 for now...
@@ -101,24 +101,24 @@ db_ps(dummy1, dummy2, dummy3, dummy4)
 		switch(p->p_state) {
 		case PRS_NORMAL:
 			if (P_SHOULDSTOP(p))
-				state = "stopped";
+				state = "stop";
 			else
-				state = "Normal";
+				state = "norm";
 			break;
 		case PRS_NEW:
-			state = "New";
+			state = "new ";
 			break;
 		case PRS_WAIT:
-			state = "Wait";
+			state = "wait";
 			break;
 		case PRS_ZOMBIE:
-			state = "Zombie";
+			state = "zomp";
 			break;
 		default:
-			state = "Unknown";
+			state = "Unkn";
 			break;
 		}
-		db_printf("%5d %8p %8p %4d %5d %5d %07x  %s",
+		db_printf("%5d %8p %8p %4d %5d %5d %07x %-4s",
 		    p->p_pid, (volatile void *)p, (void *)p->p_uarea, 
 		    p->p_ucred ? p->p_ucred->cr_ruid : 0, pp->p_pid,
 		    p->p_pgrp ? p->p_pgrp->pg_id : 0, p->p_flag, state);
@@ -140,7 +140,7 @@ db_ps(dummy1, dummy2, dummy3, dummy4)
 		} else {
 			td = FIRST_THREAD_IN_PROC(p);
 			if (td->td_wchan) {
-				db_printf("  %6s %8p", td->td_wmesg,
+				db_printf("  %-6s %8p", td->td_wmesg,
 				    (void *)td->td_wchan);
 			} else if (td->td_state == TDS_MTX) {
 				db_printf("  %6s %8p", td->td_mtxname,