commit 5bf02b34cb96a97cb6a8fa383d5c6eab3c34f8da
author Kristina Chodorow <kchodorow@google.com> Wed Jul 01 17:20:02 2015 +0000
committer Florian Weikert <fwe@google.com> Thu Jul 02 09:23:13 2015 +0000
tree b0f8b6abb2636048760cfd73f562f7bbbb115d82
parent 1b9123646e21b05ed1ff8706f4b0f32c7d2efd60

Fix zipper for empty files

It was erroring out because it could not mmap an empty file.

--
MOS_MIGRATED_REVID=97338974

third_party/ijar/test/zip_test.sh

diff --git a/third_party/ijar/test/zip_test.sh b/third_party/ijar/test/zip_test.sh
index b3247fd..83ca3f5 100755
--- a/third_party/ijar/test/zip_test.sh
+++ b/third_party/ijar/test/zip_test.sh
@@ -52,6 +52,7 @@
 function test_zipper() {
   mkdir -p ${TEST_TMPDIR}/test/path/to/some
   mkdir -p ${TEST_TMPDIR}/test/some/other/path
+  touch ${TEST_TMPDIR}/test/path/to/some/empty_file
   echo "toto" > ${TEST_TMPDIR}/test/path/to/some/file
   echo "titi" > ${TEST_TMPDIR}/test/path/to/some/other_file
   chmod +x ${TEST_TMPDIR}/test/path/to/some/other_file

third_party/ijar/zip_main.cc

diff --git a/third_party/ijar/zip_main.cc b/third_party/ijar/zip_main.cc
index cd5c2f3..aeda237 100644
--- a/third_party/ijar/zip_main.cc
+++ b/third_party/ijar/zip_main.cc
@@ -218,7 +218,7 @@
     }
 
     u1 *buffer = builder->NewFile(path, mode_to_zipattr(statst.st_mode));
-    if (isdir) {
+    if (isdir || statst.st_size == 0) {
       builder->FinishFile(0);
     } else {
       // mmap the input file and memcpy