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

spacing wrong.


git-svn-id: svn://busybox.net/trunk/busybox@15541 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 3 insertions, 2 deletions

diff --git a/libbb/dump.c b/libbb/dump.c
index b12a8e223..45ddb4034 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -424,7 +424,7 @@ static unsigned char *get(void)
 
 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 @@ static void bpad(PR * pr)
         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);
 }