From owner-p4-projects@FreeBSD.ORG  Mon Aug 21 20:58:29 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4506416A4E5; Mon, 21 Aug 2006 20:58:29 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 1F6A416A4E0
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 20:58:29 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 47AFF43D72
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 20:58:23 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7LKwNJo047771
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 20:58:23 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7LKwNOT047768
	for perforce@freebsd.org; Mon, 21 Aug 2006 20:58:23 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 21 Aug 2006 20:58:23 GMT
Message-Id: <200608212058.k7LKwNOT047768@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 104721 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 21 Aug 2006 20:58:29 -0000

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

Change 104721 by imp@imp_lighthouse on 2006/08/21 20:57:52

	cooked mode

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#6 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#6 (text+ko) ====

@@ -138,7 +138,7 @@
 xfsread(ino_t inode, void *buf, size_t nbyte)
 {
     if ((size_t)fsread(inode, buf, nbyte) != nbyte) {
-	printf("Invalid %s\n", "format");
+	printf("Invalid %s\r\n", "format");
 	return -1;
     }
     return 0;
@@ -213,13 +213,15 @@
 
     for (;;) {
 	if (!autoboot || !OPT_CHECK(RBX_QUIET))
-	    printf("\nFreeBSD/arm boot\n"
-		   "Default: %s\n"
+	    printf("\r\nFreeBSD/arm boot\r\n"
+		   "Default: %s\r\n"
 		   "boot: ", kname);
 	if (!autoboot || getc(5) == -1)
 	    getstr();
-	else if (!autoboot || !OPT_CHECK(RBX_QUIET))
+	else if (!autoboot || !OPT_CHECK(RBX_QUIET)) {
+	    xputchar('\r');
 	    xputchar('\n');
+	}
 	autoboot = 0;
 	if (parse())
 	    xputchar('\a');
@@ -241,7 +243,7 @@
 
     if (!(ino = lookup(kname))) {
 	if (!ls)
-	    printf("No %s\n", kname);
+	    printf("No %s\r\n", kname);
 	return;
     }
     if (xfsread(ino, &eh, sizeof(eh)))