diff options
| author | Natanael Copa | 2014-10-29 10:04:27 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-10-31 10:39:18 +0100 |
| commit | 7235e70391a80d2c9284552bafcb6385adfaff06 (patch) | |
| tree | bcdce77e61cef8dab9046a910827f5fd7989038d /text-utils/hexdump-parse.c | |
| parent | libmount: improve kernel command line parsing (diff) | |
| download | kernel-qcow2-util-linux-7235e70391a80d2c9284552bafcb6385adfaff06.tar.gz kernel-qcow2-util-linux-7235e70391a80d2c9284552bafcb6385adfaff06.tar.xz kernel-qcow2-util-linux-7235e70391a80d2c9284552bafcb6385adfaff06.zip | |
hexdump: use 'll' format modifier instead of the non-standard 'q'.
The printf(3) man page says about 'q':
("quad". 4.4BSD and Linux libc5 only. Don't use.) This is a synonym for ll.
This fixes hexdump with musl libc.
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Diffstat (limited to 'text-utils/hexdump-parse.c')
| -rw-r--r-- | text-utils/hexdump-parse.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c index 8d14c5b98..9eb016d6a 100644 --- a/text-utils/hexdump-parse.c +++ b/text-utils/hexdump-parse.c @@ -226,7 +226,7 @@ void rewrite_rules(struct hexdump_fs *fs, struct hexdump *hex) struct hexdump_fu *fu; struct list_head *p, *q; char *p1, *p2, *fmtp; - char savech, cs[3]; + char savech, cs[4]; int nconv, prec = 0; list_for_each (p, &fs->fulist) { @@ -301,9 +301,10 @@ void rewrite_rules(struct hexdump_fs *fs, struct hexdump *hex) goto isint; } else if (first_letter(cs, "ouxX")) { pr->flags = F_UINT; -isint: cs[2] = '\0'; - cs[1] = cs[0]; - cs[0] = 'q'; +isint: cs[3] = '\0'; + cs[2] = cs[0]; + cs[1] = 'l'; + cs[0] = 'l'; switch(fu->bcnt) { case 0: pr->bcnt = 4; @@ -355,9 +356,10 @@ isint: cs[2] = '\0'; pr->flags = F_ADDRESS; ++p2; if (first_letter(p1 + 2, "dox")) { - cs[0] = 'q'; - cs[1] = p1[2]; - cs[2] = '\0'; + cs[0] = 'l'; + cs[1] = 'l'; + cs[2] = p1[2]; + cs[3] = '\0'; } else { p1[3] = '\0'; badconv(p1); |