svn commit: trunk/busybox/libbb

[landley at busybox.net]

Author: landley
Date: 2006-06-28 07:36:50 -0700 (Wed, 28 Jun 2006)
New Revision: 15541

Log:
Fix bug http://bugs.busybox.net/view.php?id=874 where hexdump -C got its
spacing wrong.


Modified:
   trunk/busybox/libbb/dump.c


Changeset:
Modified: trunk/busybox/libbb/dump.c
===================================================================
--- trunk/busybox/libbb/dump.c	2006-06-28 14:11:25 UTC (rev 15540)
+++ trunk/busybox/libbb/dump.c	2006-06-28 14:36:50 UTC (rev 15541)
@@ -424,7 +424,7 @@
 
 static void bpad(PR * pr)
 {
-	register char *p1, *p2;
+	char *p1, *p2;
 
 	/*
 	 * remove all conversion flags; '-' is the only one valid
@@ -433,7 +433,8 @@
 	pr->flags = F_BPAD;
 	*pr->cchar = 's';
 	for (p1 = pr->fmt; *p1 != '%'; ++p1);
-	for (p2 = ++p1; *p1 && strchr(" -0+#", *p1); ++p1);
+	for (p2 = ++p1; *p1 && strchr(" -0+#", *p1); ++p1)
+		if (pr->nospace) pr->nospace--;
 	while ((*p2++ = *p1++) != 0);
 }