 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_proc.c,v 1.15 2024/01/22 07:57:48 skrll Exp $	*/
+/*	$NetBSD: db_proc.c,v 1.16 2024/04/15 06:48:06 skrll Exp $	*/
 /*-
  * Copyright (c) 2009, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: kern_proc.c	8.4 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_proc.c,v 1.15 2024/01/22 07:57:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_proc.c,v 1.16 2024/04/15 06:48:06 skrll Exp $");
 #ifndef _KERNEL
 #include <stdbool.h>
 #endif
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #ifdef _KERNEL	/* XXX */
 #include <sys/kauth.h>
 #endif
 #include <ddb/ddb.h>
 @@ -143,35 +143,35 @@ db_show_all_procs(db_expr_t addr, bool h
 		db_printf("\t/a == show process address info\n");
 		db_printf("\t/l == show LWP info [default]\n");
 		db_printf("\t/n == show normal process info\n");
 		db_printf("\t/w == show process wait/emul info\n");
 		return;
+	}
 	switch (*mode) {
 	case 'a':
 		db_printf("PID   %-16s %18s %18s %18s\n",
 		    "COMMAND", "STRUCT PROC *", "UAREA *", "VMSPACE/VM_MAP");
 		break;
 	case 'l':
-		db_printf("PID   %4s S %3s %9s %18s %18s %-8s\n",
+		db_printf("PID   %5s S %3s %9s %18s %18s %-8s\n",
 		    "LID", "CPU", "FLAGS", "STRUCT LWP *", "NAME", "WAIT");
 		break;
 	case 'n':
 		db_printf("PID  %8s %8s %10s S %7s %4s %16s %7s\n",
 		    "PPID", "PGRP", "UID", "FLAGS", "LWPS", "COMMAND", "WAIT");
 		break;
 	case 'w':
-		db_printf("PID   %4s %16s %8s %4s %-16s %s\n",
+		db_printf("PID   %5s %16s %8s %4s %-16s %s\n",
 		    "LID", "COMMAND", "EMUL", "PRI", "WAIT-MSG",
 		    "WAIT-CHANNEL");
 		break;
+	}
 	for (pp = db_proc_first(); pp != NULL; pp = db_proc_next(pp)) {
 		db_read_bytes((db_addr_t)pp, sizeof(p), (char *)&p);
 		if (p.p_stat == 0) {
 			continue;
+		}
 		lp = p.p_lwps.lh_first;
 		if (lp != NULL) {
 			db_read_bytes((db_addr_t)lp, sizeof(l), (char *)&l);
 @@ -200,27 +200,27 @@ db_show_all_procs(db_expr_t addr, bool h
 				if (l.l_cpu != NULL) {
 					db_read_bytes((db_addr_t)
 					    &l.l_cpu->ci_data.cpu_index,
 					    sizeof(cpuno), (char *)&cpuno);
 				} else
 					cpuno = -1;
 				if (l.l_wchan && l.l_wmesg) {
 					db_read_string(l.l_wmesg,
 					    sizeof(wbuf), wbuf);
 					wbuf[MAXCOMLEN] = '\0';
 				} else {
 					wbuf[0] = '\0';
+				}
-				db_printf("%c%4d %d %3d %9x %18lx %18s %-8s\n",
+				db_printf("%c%5d %d %3d %9x %18lx %18s %-8s\n",
 				    (run ? '>' : ' '), l.l_lid,
 				    l.l_stat, cpuno, l.l_flag, (long)lp,
 				    db_nbuf, wbuf);
 				lp = LIST_NEXT((&l), l_sibling);
 				if (lp != NULL) {
 					db_printf("%-5d", p.p_pid);
 					db_read_bytes((db_addr_t)lp, sizeof(l),
 					    (char *)&l);
+				}
+			}
 			break;
 		case 'n':
 			db_read_bytes((db_addr_t)p.p_pgrp, sizeof(pgrp),
 @@ -252,27 +252,27 @@ db_show_all_procs(db_expr_t addr, bool h
 					wbuf[MAXCOMLEN] = '\0';
 				} else {
 					wbuf[0] = '\0';
+				}
 				run = (l.l_stat == LSONPROC ||
 				    (l.l_pflag & LP_RUNNING) != 0);
 				db_read_bytes((db_addr_t)&p.p_emul->e_name,
 				    sizeof(ename), (char *)&ename);
 				db_read_string(ename, sizeof(db_nbuf), db_nbuf);
 				db_nbuf[MAXCOMLEN] = '\0';
 				db_printf(
-				    "%c%4d %16s %8s %4d %-16s %-18lx\n",
+				    "%c%5d %16s %8s %4d %-16s %-18lx\n",
 				    (run ? '>' : ' '), l.l_lid,
 				    p.p_comm, db_nbuf,
 				    l.l_priority, wbuf, (long)l.l_wchan);
 				lp = LIST_NEXT((&l), l_sibling);
 				if (lp != NULL) {
 					db_printf("%-5d", p.p_pid);
 					db_read_bytes((db_addr_t)lp, sizeof(l),
 					    (char *)&l);
+				}
+			}
 			break;
+		}
+	}