2 files changed, 11 insertions, 6 deletions

diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index ed328be8b893..04793c91ebe3 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.c,v 1.6 1994/08/13 03:49:16 wollman Exp $
+ *	$Id: db_command.c,v 1.7 1994/08/18 22:34:20 wollman Exp $
  */
 
 /*
@@ -306,15 +306,15 @@ db_command(last_cmdp, cmd_table)
 
 extern void	db_show_one_thread(), db_show_all_threads();
 extern void	vm_page_print();
-/* extern void	db_ps(); */
+extern void	db_ps();
 extern void	ipc_port_print();
 void		db_show_help();
 
 struct command db_show_all_cmds[] = {
 #if 0
 	{ "threads",	db_show_all_threads,	0,	0 },
-	{ "procs",	db_ps,			0,	0 },
 #endif
+	{ "procs",	db_ps,			0,	0 },
 	{ (char *)0 }
 };
 
@@ -363,9 +363,7 @@ struct command db_command_table[] = {
 	{ "trace",	db_stack_trace_cmd,	0,	0 },
 	{ "call",	db_fncall,		CS_OWN,	0 },
 	{ "show",	0,			0,	db_show_cmds },
-#if 0
 	{ "ps",		db_ps,			0,	0 },
-#endif
 	{ (char *)0, }
 };
 
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 98b668a3fbf4..f2b14e4789a2 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_output.c,v 1.6 1993/12/19 00:49:45 wollman Exp $
+ *	$Id: db_output.c,v 1.7 1994/08/13 03:49:21 wollman Exp $
  */
 
 /*
@@ -107,6 +107,13 @@ db_putchar(c)
 	    db_last_non_space = db_output_position;
 	}
 	else if (c == '\n') {
+	    /* Newline */
+	    cnputc(c);
+	    db_output_position = 0;
+	    db_last_non_space = 0;
+	    db_check_interrupt();
+	}
+	else if (c == '\r') {
 	    /* Return */
 	    cnputc(c);
 	    db_output_position = 0;