Mercurial > vim
changeset 13326:7f1a5e8d8289 v8.0.1537
patch 8.0.1537: xxd does not skip NUL lines when using ebcdic
commit https://github.com/vim/vim/commit/085346f5a1ab5828b1fd80990d93172440c54724
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 24 18:30:55 2018 +0100
patch 8.0.1537: xxd does not skip NUL lines when using ebcdic
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 24 Feb 2018 18:45:06 +0100 |
| parents | a918cd8aa387 |
| children | e32f79483a08 |
| files | src/version.c src/xxd/xxd.c |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -779,6 +779,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1537, +/**/ 1536, /**/ 1535,
--- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -827,6 +827,8 @@ main(int argc, char *argv[]) for (i = 7; i >= 0; i--) l[++c] = (e & (1 << i)) ? '1' : '0'; } + if (e) + nonzero++; if (ebcdic) e = (e < 64) ? '.' : etoa64[e-64]; /* When changing this update definition of LLEN above. */ @@ -837,8 +839,6 @@ main(int argc, char *argv[]) (e > 31 && e < 127) #endif ? e : '.'; - if (e) - nonzero++; n++; if (++p == cols) {