Merge "Revert :Force sync files written by minzip" into android-6.0
diff --git a/minzip/Zip.c b/minzip/Zip.c
index c627250..1f035ad 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -977,8 +977,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);
@@ -993,12 +992,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;