diff options
| author | Rob Landley <rob@landley.net> | 2006-06-28 14:36:50 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-06-28 14:36:50 +0000 |
| commit | a6e6037219ff8f8992d4c7c366b4472b57c4aadc (patch) | |
| tree | ea2056a9e2abca2a55782871dd5dda29480d2701 /libbb/dump.c | |
| parent | db1ab1aeb3dd4401411d147e290261c8f1ad472f (diff) | |
| download | busybox-w32-a6e6037219ff8f8992d4c7c366b4472b57c4aadc.tar.gz busybox-w32-a6e6037219ff8f8992d4c7c366b4472b57c4aadc.tar.bz2 busybox-w32-a6e6037219ff8f8992d4c7c366b4472b57c4aadc.zip | |
Fix bug http://bugs.busybox.net/view.php?id=874 where hexdump -C got its
spacing wrong.
Diffstat (limited to 'libbb/dump.c')
| -rw-r--r-- | libbb/dump.c | 5 |
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) | |||
| 424 | 424 | ||
| 425 | static void bpad(PR * pr) | 425 | static void bpad(PR * pr) |
| 426 | { | 426 | { |
| 427 | register char *p1, *p2; | 427 | char *p1, *p2; |
| 428 | 428 | ||
| 429 | /* | 429 | /* |
| 430 | * remove all conversion flags; '-' is the only one valid | 430 | * remove all conversion flags; '-' is the only one valid |
| @@ -433,7 +433,8 @@ static void bpad(PR * pr) | |||
| 433 | pr->flags = F_BPAD; | 433 | pr->flags = F_BPAD; |
| 434 | *pr->cchar = 's'; | 434 | *pr->cchar = 's'; |
| 435 | for (p1 = pr->fmt; *p1 != '%'; ++p1); | 435 | for (p1 = pr->fmt; *p1 != '%'; ++p1); |
| 436 | for (p2 = ++p1; *p1 && strchr(" -0+#", *p1); ++p1); | 436 | for (p2 = ++p1; *p1 && strchr(" -0+#", *p1); ++p1) |
| 437 | if (pr->nospace) pr->nospace--; | ||
| 437 | while ((*p2++ = *p1++) != 0); | 438 | while ((*p2++ = *p1++) != 0); |
| 438 | } | 439 | } |
| 439 | 440 | ||