From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 24 Feb 2018 17:30:55 +0000 (+0100)
Subject: patch 8.0.1537: xxd does not skip NUL lines when using ebcdic
X-Git-Tag: v8.0.1537
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=085346f5a1ab5828b1fd80990d93172440c54724;p=vim

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)
---

diff --git a/src/version.c b/src/version.c
index b2a2e8f4f..ede62c912 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1537,
 /**/
     1536,
 /**/
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index f76adaa3a..f89f4d3b0 100644
--- 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)
 	{