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

Commit d3cac344 authored by Tao Bao's avatar Tao Bao
Browse files

updater: Use O_SYNC and fsync() for package_extract_file(). 

We are already using O_SYNC and fsync() for the recursive case
(package_extract_dir()). Make it consistent for the single-file case.

Bug: 20625549
Change-Id: I487736fe5a0647dd4a2428845e76bf642e0f0dff
parent e062645e

updater/install.cpp

+13 −6
Original line number Diff line number Diff line
@@ -555,14 +555,21 @@ Value* PackageExtractFileFn(const char* name, State* state, 
        }



        {

            FILE* f = fopen(dest_path, "wb");

            if (f == NULL) {

                printf("%s: can't open %s for write: %s\n",

                        name, dest_path, strerror(errno));

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

                  S_IRUSR | S_IWUSR));

            if (fd == -1) {

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

                goto done2;

            }

            success = mzExtractZipEntryToFile(za, entry, fileno(f));

            fclose(f);

            success = mzExtractZipEntryToFile(za, entry, fd);

            if (fsync(fd) == -1) {

                printf("fsync of \"%s\" failed: %s\n", dest_path, strerror(errno));

                success = false;

            }

            if (close(fd) == -1) {

                printf("close of \"%s\" failed: %s\n", dest_path, strerror(errno));

                success = false;

            }

        }



      done2: