* [PATCH] hexdump: convert a variable type according with fmt
@ 2013-12-27 13:45 Andrey Vagin
2014-01-06 13:03 ` Karel Zak
0 siblings, 1 reply; 2+ messages in thread
From: Andrey Vagin @ 2013-12-27 13:45 UTC (permalink / raw)
To: util-linux; +Cc: Karel Zak, Andrew Vagin
From: Andrew Vagin <avagin@openvz.org>
hexdump works uncorrectly on Rassberry Pi (raspbian wheezy):
0000000 3200000000 3400000000 3600000000 3800000000 a00000000
000000a
The problem is that the %qx format is used for printing
the (short int) variable.
Here is the output from hexdump with this patch:
0000000 3231 3433 3635 3837 0a39
000000a
Currently raspbian uses hexdump from bsdmainutils.
bsdmainutils: /usr/bin/hexdump
Signed-off-by: Andrew Vagin <avagin@openvz.org>
---
text-utils/hexdump-display.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/text-utils/hexdump-display.c b/text-utils/hexdump-display.c
index 67f426d..b195a01 100644
--- a/text-utils/hexdump-display.c
+++ b/text-utils/hexdump-display.c
@@ -93,15 +93,15 @@ print(struct hexdump_pr *pr, unsigned char *bp) {
switch(pr->bcnt) {
case 1:
- printf(pr->fmt, *bp);
+ printf(pr->fmt, (unsigned long long) *bp);
break;
case 2:
memmove(&sval, bp, sizeof(sval));
- printf(pr->fmt, sval);
+ printf(pr->fmt, (unsigned long long) sval);
break;
case 4:
memmove(&ival, bp, sizeof(ival));
- printf(pr->fmt, ival);
+ printf(pr->fmt, (unsigned long long) ival);
break;
case 8:
memmove(&Lval, bp, sizeof(Lval));
@@ -130,15 +130,15 @@ print(struct hexdump_pr *pr, unsigned char *bp) {
switch(pr->bcnt) {
case 1:
- printf(pr->fmt, *bp);
+ printf(pr->fmt, (unsigned long long) *bp);
break;
case 2:
memmove(&sval, bp, sizeof(sval));
- printf(pr->fmt, sval);
+ printf(pr->fmt, (unsigned long long) sval);
break;
case 4:
memmove(&ival, bp, sizeof(ival));
- printf(pr->fmt, ival);
+ printf(pr->fmt, (unsigned long long) ival);
break;
case 8:
memmove(&Lval, bp, sizeof(Lval));
--
1.8.4.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] hexdump: convert a variable type according with fmt
2013-12-27 13:45 [PATCH] hexdump: convert a variable type according with fmt Andrey Vagin
@ 2014-01-06 13:03 ` Karel Zak
0 siblings, 0 replies; 2+ messages in thread
From: Karel Zak @ 2014-01-06 13:03 UTC (permalink / raw)
To: Andrey Vagin; +Cc: util-linux
On Fri, Dec 27, 2013 at 05:45:57PM +0400, Andrey Vagin wrote:
> text-utils/hexdump-display.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
Applied, thanks.
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-06 13:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-27 13:45 [PATCH] hexdump: convert a variable type according with fmt Andrey Vagin
2014-01-06 13:03 ` Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox