diff options
author | Ron Yorston <rmy@pobox.com> | 2024-12-30 14:45:15 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2024-12-30 14:45:15 +0000 |
commit | 370ce52cca8e7e8a341d5e238a79fd67f6048bb6 (patch) | |
tree | 48c78d906a4467bb618946d96574a5bc21cacfba /libbb/dump.c | |
parent | dc3ee8e0523a4f651f3012ae1f5a181548187709 (diff) | |
parent | 14f57f5357cb674b88e7cdaff6267bf9d84c6b80 (diff) | |
download | busybox-w32-merge.tar.gz busybox-w32-merge.tar.bz2 busybox-w32-merge.zip |
Merge branch 'busybox' into mergemerge
Diffstat (limited to 'libbb/dump.c')
-rw-r--r-- | libbb/dump.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libbb/dump.c b/libbb/dump.c index ffc46f6a7..aa57eca8c 100644 --- a/libbb/dump.c +++ b/libbb/dump.c | |||
@@ -204,9 +204,11 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs) | |||
204 | if (!e) | 204 | if (!e) |
205 | goto DO_BAD_CONV_CHAR; | 205 | goto DO_BAD_CONV_CHAR; |
206 | pr->flags = F_INT; | 206 | pr->flags = F_INT; |
207 | if (e > int_convs + 1) /* not d or i? */ | ||
208 | pr->flags = F_UINT; | ||
209 | byte_count_str = "\010\004\002\001"; | 207 | byte_count_str = "\010\004\002\001"; |
208 | if (e > int_convs + 1) { /* not d or i? */ | ||
209 | pr->flags = F_UINT; | ||
210 | byte_count_str++; | ||
211 | } | ||
210 | goto DO_BYTE_COUNT; | 212 | goto DO_BYTE_COUNT; |
211 | } else | 213 | } else |
212 | if (strchr(int_convs, *p1)) { /* %d etc */ | 214 | if (strchr(int_convs, *p1)) { /* %d etc */ |