The patch titled
Subject: hexdump: fix ascii column for the tail of a dump
has been added to the -mm tree. Its filename is
hexdump-fix-ascii-column-for-the-tail-of-a-dump.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/hexdump-fix-ascii-column-for-the-tail-of-a-dump.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/hexdump-fix-ascii-column-for-the-tail-of-a-dump.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Subject: hexdump: fix ascii column for the tail of a dump
In the current implementation we have a floating ascii column in the tail
of the dump.
For example, for row size equal to 16 the ascii column as in following
table
group size \ length 8 12 16
1 50 50 50
2 22 32 42
4 20 29 38
8 19 - 36
This patch makes it the same independently of amount of bytes dumped.
The change is safe since all current users, which use ASCII part of the
dump, rely on the group size equal to 1. The patch doesn't change
behaviour for such group size (see the table above).
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/hexdump.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN lib/hexdump.c~hexdump-fix-ascii-column-for-the-tail-of-a-dump lib/hexdump.c
--- a/lib/hexdump.c~hexdump-fix-ascii-column-for-the-tail-of-a-dump
+++ a/lib/hexdump.c
@@ -126,7 +126,7 @@ void hex_dump_to_buffer(const void *buf,
lx += scnprintf(linebuf + lx, linebuflen - lx,
"%s%16.16llx", j ? " " : "",
(unsigned long long)*(ptr8 + j));
- ascii_column = 17 * ngroups + 2;
+ ascii_column = rowsize * 2 + rowsize / 8 + 2;
break;
}
@@ -137,7 +137,7 @@ void hex_dump_to_buffer(const void *buf,
for (j = 0; j < ngroups; j++)
lx += scnprintf(linebuf + lx, linebuflen - lx,
"%s%8.8x", j ? " " : "", *(ptr4 + j));
- ascii_column = 9 * ngroups + 2;
+ ascii_column = rowsize * 2 + rowsize / 4 + 2;
break;
}
@@ -148,7 +148,7 @@ void hex_dump_to_buffer(const void *buf,
for (j = 0; j < ngroups; j++)
lx += scnprintf(linebuf + lx, linebuflen - lx,
"%s%4.4x", j ? " " : "", *(ptr2 + j));
- ascii_column = 5 * ngroups + 2;
+ ascii_column = rowsize * 2 + rowsize / 2 + 2;
break;
}
_
Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are
hexdump-introduce-test-suite.patch
hexdump-fix-ascii-column-for-the-tail-of-a-dump.patch
hexdump-do-few-calculations-ahead.patch
hexdump-makes-it-return-amount-of-bytes-placed-in-buffer.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
