PERFORCE change 104721 for review

[Warner Losh]

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

Change 104721 by imp at 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)))