4 files changed, 12 insertions, 11 deletions
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index fce02ce84bb..be23b41e9e5 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_command.c,v 1.11 1997/01/27 07:53:53 deraadt Exp $	*/
+/*	$OpenBSD: db_command.c,v 1.12 1997/07/07 19:45:20 niklas Exp $	*/
 /*	$NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $	*/
 
 /* 
@@ -144,7 +144,7 @@ db_cmd_list(table)
 
 	for (cmd = table; cmd->name != 0; cmd++) {
 	    db_printf("%-12s", cmd->name);
-	    db_end_line();
+	    db_end_line(12);
 	}
 }
 
@@ -402,7 +402,7 @@ db_help_cmd()
 
 	while (cmd->name != 0) {
 	    db_printf("%-12s", cmd->name);
-	    db_end_line();
+	    db_end_line(12);
 	    cmd++;
 	}
 }
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 825a8cdadba..6491364c1ac 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_examine.c,v 1.6 1997/07/06 23:09:24 niklas Exp $	*/
+/*	$OpenBSD: db_examine.c,v 1.7 1997/07/07 19:45:22 niklas Exp $	*/
 /*	$NetBSD: db_examine.c,v 1.11 1996/03/30 22:30:07 christos Exp $	*/
 
 /*
@@ -67,7 +67,7 @@ db_examine_cmd(addr, have_addr, count, modif)
 	if (count == -1)
 		count = 1;
 
-	db_examine((db_addr_t) addr, db_examine_format, count);
+	db_examine((db_addr_t)addr, db_examine_format, count);
 }
 
 void
@@ -173,7 +173,7 @@ db_examine(addr, fmt, count)
 				break;
 			}
 			if (db_print_position() != 0)
-				db_end_line();
+				db_end_line(width);
 		}
 	}
 	db_next = addr;
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 22ed55c7761..9f7c14297df 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_output.c,v 1.11 1997/07/03 21:24:13 niklas Exp $	*/
+/*	$OpenBSD: db_output.c,v 1.12 1997/07/07 19:45:23 niklas Exp $	*/
 /*	$NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $	*/
 
 /* 
@@ -251,9 +251,10 @@ kdbprintf(fmt, va_alist)
  * End line if too long.
  */
 void
-db_end_line()
+db_end_line(space)
+	int space;
 {
-	if (db_output_position >= db_max_width)
+	if (db_output_position >= db_max_width - space)
 	    db_printf("\n");
 }
 
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 58ed3e49d3a..29e533d4c98 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_output.h,v 1.7 1996/07/24 21:58:04 niklas Exp $ */
+/*	$OpenBSD: db_output.h,v 1.8 1997/07/07 19:45:25 niklas Exp $ */
 /*	$NetBSD: db_output.h,v 1.9 1996/04/04 05:13:50 cgd Exp $	*/
 
 /* 
@@ -40,4 +40,4 @@ int db_printf __P((const char *, ...))
     __kprintf_attribute__((__format__(__kprintf__,1,2)));
 int kdbprintf __P((const char *, ...))
     __kprintf_attribute__((__format__(__kprintf__,1,2)));
-void db_end_line __P((void));
+void db_end_line __P((int));