commit e908a45420fc4194c6007193d21d5b690e04583f
author Michael Runge <mrunge@google.com> Wed Oct 29 18:51:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 29 18:51:51 2014 +0000
tree db2ebc4119b203ae3fe0d9d1b10b81ecfc4eb4b6
parent fe8563f4f2a6efe1eb00bb41a5037c88917becfc
parent 042c3cd04ec3ef416019fa382cd5b1a942bd79e1

am 042c3cd0: Force sync files written by minzip.

* commit '042c3cd04ec3ef416019fa382cd5b1a942bd79e1':
  Force sync files written by minzip.

minzip/Zip.c

diff --git a/minzip/Zip.c b/minzip/Zip.c
index 5070104..70aff00 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -1067,7 +1067,8 @@
                     setfscreatecon(secontext);
                 }
 
-                int fd = creat(targetFile, UNZIP_FILEMODE);
+                int fd = open(targetFile, O_CREAT|O_WRONLY|O_TRUNC|O_SYNC
+                        , UNZIP_FILEMODE);
 
                 if (secontext) {
                     freecon(secontext);
@@ -1082,7 +1083,12 @@
                 }
 
                 bool ok = mzExtractZipEntryToFile(pArchive, pEntry, fd);
-                close(fd);
+                if (ok) {
+                    ok = (fsync(fd) == 0);
+                }
+                if (close(fd) != 0) {
+                    ok = false;
+                }
                 if (!ok) {
                     LOGE("Error extracting \"%s\"\n", targetFile);
                     ok = false;