patch 9.0.1383: xxd: combination of little endian and cols fails
Problem: xxd: combination of little endian and cols fails. (Aapo
Rantalainen)
Solution: Round up the space taken by the hex output. (closes #12097)
diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index 92a4d05..d20ea9c 100644
--- a/src/testdir/test_xxd.vim
+++ b/src/testdir/test_xxd.vim
@@ -401,4 +401,18 @@
endfor
endfunc
+func Test_xxd_little_endian_with_cols()
+ enew!
+ call writefile(["ABCDEF"], 'Xxdin', 'D')
+ exe 'r! ' .. s:xxd_cmd .. ' -e -c6 ' .. ' Xxdin'
+ call assert_equal('00000000: 44434241 4645 ABCDEF', getline(2))
+
+ enew!
+ call writefile(["ABCDEFGHI"], 'Xxdin', 'D')
+ exe 'r! ' .. s:xxd_cmd .. ' -e -c9 ' .. ' Xxdin'
+ call assert_equal('00000000: 44434241 48474645 49 ABCDEFGHI', getline(2))
+
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 8533a08..4482a6e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1383,
+/**/
1382,
/**/
1381,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 2105a1c..e2fc9df 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -837,7 +837,8 @@
{
addrlen = sprintf(l, decimal_offset ? "%08ld:" : "%08lx:",
((unsigned long)(n + seekoff + displayoff)));
- for (c = addrlen; c < LLEN; l[c++] = ' ');
+ for (c = addrlen; c < LLEN; l[c++] = ' ')
+ ;
}
x = hextype == HEX_LITTLEENDIAN ? p ^ (octspergrp-1) : p;
c = addrlen + 1 + (grplen * x) / octspergrp;
@@ -857,7 +858,12 @@
if (ebcdic)
e = (e < 64) ? '.' : etoa64[e-64];
/* When changing this update definition of LLEN above. */
- c = addrlen + 3 + (grplen * cols - 1)/octspergrp + p;
+ if (hextype == HEX_LITTLEENDIAN)
+ /* last group will be fully used, round up */
+ c = grplen * ((cols + octspergrp - 1) / octspergrp);
+ else
+ c = (grplen * cols - 1) / octspergrp;
+ c += addrlen + 3 + p;
l[c++] =
#ifdef __MVS__
(e >= 64)