commit 89d90e2b9ae24203f9c1b034fe119154be0205f1
author Andrew Dodd <atd7@cornell.edu> Thu Mar 19 16:28:29 2015 +0100
committer Gerrit Code Review <gerrit2@gerrit> Thu Mar 19 16:28:30 2015 +0100
tree bf400bca1ccfe2c64808bfa33e836c7d7805e39e
parent d86f49d3f7bc4e9ec6c3ddffa4723ef624eb66b2
parent de72a98328213a5929723913086b20023335d07b

Merge "Revert "Force sync files written by minzip."" into android-5.1

minzip/Zip.c

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