updated for version 7.3.835

Problem:    "xxd -i" fails on an empty file.
Solution:   Do output the closing } for an empty file. (partly by Lawrence
            Woodman)

diff --git a/src/version.c b/src/version.c
index 309732afb8b9efd46c55720a3bf25694bd01a2f2..f1a090921cda64f1f9fcfb388a200e6f4ba623aa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    835,
 /**/
     834,
 /**/

diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 85300dc9d0537af6b70b45af2ba3b317a93dc2cc..209ede43d1ca24b9fd337ab225a45234940b7e7b 100644 (file)
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -729,9 +729,10 @@ main(argc, argv)
       if (c == EOF && ferror(fp))
        die(2);
 
-      if (p)
-       if (fputs("\n};\n" + 3 * (fp == stdin), fpo) == EOF)
-         die(3);
+      if (p && fputs("\n", fpo) == EOF)
+       die(3);
+      if (fputs("};\n" + 3 * (fp == stdin), fpo) == EOF)
+       die(3);
 
       if (fp != stdin)
        {