From 6e08f55368b006fd0d70be0906a728f7dd2f448a Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Sat, 1 Mar 2008 21:03:35 +0100
Subject: memory_display() used to show the ascii output on the last line not
 exactly under the other lines. fix it.

---
 commands/mem.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'commands/mem.c')

diff --git a/commands/mem.c b/commands/mem.c
index 09565505c4..f6ab538bf9 100644
--- a/commands/mem.c
+++ b/commands/mem.c
@@ -72,23 +72,26 @@ int memory_display(char *addr, ulong offs, ulong nbytes, int size)
 		uint	*uip = (uint   *)linebuf;
 		ushort	*usp = (ushort *)linebuf;
 		u_char	*ucp = (u_char *)linebuf;
+		uint	count = 52;
 
 		printf("%08lx:", offs);
-		linebytes = (nbytes>DISP_LINE_LEN)?DISP_LINE_LEN:nbytes;
+		linebytes = (nbytes > DISP_LINE_LEN) ? DISP_LINE_LEN : nbytes;
 
-		for (i=0; i<linebytes; i+= size) {
+		for (i = 0; i < linebytes; i += size) {
 			if (size == 4) {
-				printf(" %08x", (*uip++ = *((uint *)addr)));
+				count -= printf(" %08x", (*uip++ = *((uint *)addr)));
 			} else if (size == 2) {
-				printf(" %04x", (*usp++ = *((ushort *)addr)));
+				count -= printf(" %04x", (*usp++ = *((ushort *)addr)));
 			} else {
-				printf(" %02x", (*ucp++ = *((u_char *)addr)));
+				count -= printf(" %02x", (*ucp++ = *((u_char *)addr)));
 			}
 			addr += size;
 			offs += size;
 		}
 
-		puts ("    ");
+		while(count--)
+			putchar(' ');
+
 		cp = (u_char *)linebuf;
 		for (i=0; i<linebytes; i++) {
 			if ((*cp < 0x20) || (*cp > 0x7e))
-- 
cgit v1.2.3