From owner-p4-projects@FreeBSD.ORG  Fri Oct 29 15:05:02 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8008016A4D0; Fri, 29 Oct 2004 15:05:02 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 437B116A4CE
	for <perforce@freebsd.org>; Fri, 29 Oct 2004 15:05:02 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3889443D3F
	for <perforce@freebsd.org>; Fri, 29 Oct 2004 15:05:02 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9TF529V076262
	for <perforce@freebsd.org>; Fri, 29 Oct 2004 15:05:02 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9TF51mN076259
	for perforce@freebsd.org; Fri, 29 Oct 2004 15:05:01 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 29 Oct 2004 15:05:01 GMT
Message-Id: <200410291505.i9TF51mN076259@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 63942 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Oct 2004 15:05:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=63942

Change 63942 by jhb@jhb_slimer on 2004/10/29 15:04:54

	Overwrite the more prompt with spaces before continuing.  This also
	removes the need for the extra newline when quitting.

Affected files ...

.. //depot/projects/smpng/sys/ddb/db_output.c#12 edit

Differences ...

==== //depot/projects/smpng/sys/ddb/db_output.c#12 (text+ko) ====

@@ -198,10 +198,11 @@
 void
 db_simple_pager(void *arg)
 {
-	int c;
+	int c, done;
 
 	db_printf("--More--\r");
-	for (;;) {
+	done = 0;
+	while (!done) {
 		c = cngetc();
 		switch (c) {
 		case 'e':
@@ -209,18 +210,21 @@
 		case '\n':
 			/* Just one more line. */
 			db_setup_paging(db_simple_pager, arg, 1);
-			return;
+			done++;
+			break;
 		case 'd':
 			/* Half a page. */
 			db_setup_paging(db_simple_pager, arg,
 			    db_lines_per_page / 2);
-			return;
+			done++;
+			break;
 		case 'f':
 		case ' ':
 			/* Another page. */
 			db_setup_paging(db_simple_pager, arg,
 			    db_lines_per_page);
-			return;
+			done++;
+			break;
 		case 'q':
 		case 'Q':
 		case 'x':
@@ -228,8 +232,8 @@
 			/* Quit */
 			if (arg != NULL) {
 				*(int *)arg = 1;
-				db_printf("\n");
-				return;
+				done++;
+				break;
 			}
 #if 0
 			/* FALLTHROUGH */
@@ -238,6 +242,7 @@
 #endif
 		}
 	}
+	db_printf("        \r");
 }
 
 /*