diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-02-26 14:14:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-02-26 14:14:07 +0100 |
| commit | 53eb37e9f9dfba51092f72553d79d3bb677a336b (patch) | |
| tree | 2d8e5bb3d0fc882d6a4ea5bd140c0b5b3b9e84a9 | |
| parent | 886ed691d26dd0253608eee174fecc24130e4de7 (diff) | |
| download | vim-git-53eb37e9f9dfba51092f72553d79d3bb677a336b.tar.gz | |
updated for version 7.3.835v7.3.835
Problem: "xxd -i" fails on an empty file.
Solution: Do output the closing } for an empty file. (partly by Lawrence
Woodman)
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/version.c b/src/version.c index 309732afb..f1a090921 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 835, +/**/ 834, /**/ 833, diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index 85300dc9d..209ede43d 100644 --- 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) { |