thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1537: xxd does not skip NUL lines when using ebcdic

Browse Source 
Problem:    Xxd does not skip NUL lines when using ebcdic.
Solution:   Check for a NUL before converting a character for ebcdic. (Tim
            Sell, closes #2668)
This commit is contained in:
Bram Moolenaar
2018-02-24 18:30:55 +01:00
parent 791010e648
commit 085346f5a1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1537,
/**/ /**/
1536, 1536,
/**/ /**/

4
src/xxd/xxd.c
View File

@@ -827,6 +827,8 @@ main(int argc, char *argv[])
for (i = 7; i >= 0; i--) for (i = 7; i >= 0; i--)
l[++c] = (e & (1 << i)) ? '1' : '0'; l[++c] = (e & (1 << i)) ? '1' : '0';
} }
if (e)
nonzero++;
if (ebcdic) if (ebcdic)
e = (e < 64) ? '.' : etoa64[e-64]; e = (e < 64) ? '.' : etoa64[e-64];
/* When changing this update definition of LLEN above. */ /* When changing this update definition of LLEN above. */
@@ -837,8 +839,6 @@ main(int argc, char *argv[])
(e > 31 && e < 127) (e > 31 && e < 127)
#endif #endif
? e : '.'; ? e : '.';
if (e)
nonzero++;
n++; n++;
if (++p == cols) if (++p == cols)
{ {