Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aec86d36 authored by Alistair Strachan's avatar Alistair Strachan Committed by android-build-merger
Browse files

Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb22 am: d03ee52e 

am: eef053fd

* commit 'eef053fd':
  updater, minzip: Remove unnecessary O_SYNC flags.

Change-Id: I013b5ea0bff4a8ac9f1b9ed1c4a1d18a67bb3b2c
parents 24fdd7fb eef053fd

minzip/Zip.c

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ bool mzExtractRecursive(const ZipArchive *pArchive, 
                setfscreatecon(secontext);

            }



            int fd = open(targetFile, O_CREAT|O_WRONLY|O_TRUNC|O_SYNC,

            int fd = open(targetFile, O_CREAT|O_WRONLY|O_TRUNC,

                UNZIP_FILEMODE);



            if (secontext) {

updater/install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ Value* PackageExtractFileFn(const char* name, State* state, 
        }



        {

            int fd = TEMP_FAILURE_RETRY(ota_open(dest_path, O_WRONLY | O_CREAT | O_TRUNC | O_SYNC,

            int fd = TEMP_FAILURE_RETRY(ota_open(dest_path, O_WRONLY | O_CREAT | O_TRUNC,

                  S_IRUSR | S_IWUSR));

            if (fd == -1) {

                printf("%s: can't open %s for write: %s\n", name, dest_path, strerror(errno));