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

Commit 3a301919 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea17... 

Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea17 am: 6d8827e0 am: 96b5bb96
am: f2a279ad

Change-Id: I85c1b30fe78f99a935a19ba28d02841f68216226
parents f7cc0e0c f2a279ad

install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ int update_binary_command(const std::string& package, ZipArchiveHandle zip, 
  }



  unlink(binary_path.c_str());

  int fd = creat(binary_path.c_str(), 0755);

  int fd = open(binary_path.c_str(), O_CREAT | O_WRONLY | O_TRUNC | O_CLOEXEC, 0755);

  if (fd == -1) {

    PLOG(ERROR) << "Failed to create " << binary_path;

    return INSTALL_ERROR;

minui/resources.cpp

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int open_png(const char* name, png_structp* png_ptr, png_infop* info_ptr, 


    snprintf(resPath, sizeof(resPath)-1, "/res/images/%s.png", name);

    resPath[sizeof(resPath)-1] = '\0';

    FILE* fp = fopen(resPath, "rb");

    FILE* fp = fopen(resPath, "rbe");

    if (fp == NULL) {

        result = -1;

        goto exit;

recovery-persist.cpp

+15 −15
Original line number Diff line number Diff line
@@ -59,11 +59,11 @@ static void check_and_fclose(FILE *fp, const char *name) { 
}



static void copy_file(const char* source, const char* destination) {

    FILE* dest_fp = fopen(destination, "w");

  FILE* dest_fp = fopen(destination, "we");

  if (dest_fp == nullptr) {

    PLOG(ERROR) << "Can't open " << destination;

  } else {

        FILE* source_fp = fopen(source, "r");

    FILE* source_fp = fopen(source, "re");

    if (source_fp != nullptr) {

      char buf[4096];

      size_t bytes;
@@ -120,7 +120,7 @@ int main(int argc, char **argv) { 
     */

    bool has_cache = false;

    static const char mounts_file[] = "/proc/mounts";

    FILE *fp = fopen(mounts_file, "r");

    FILE* fp = fopen(mounts_file, "re");

    if (!fp) {

        PLOG(ERROR) << "failed to open " << mounts_file;

    } else {

recovery.cpp

+24 −24
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void redirect_stdio(const char* filename) { 
        auto start = std::chrono::steady_clock::now();



        // Child logger to actually write to the log file.

        FILE* log_fp = fopen(filename, "a");

        FILE* log_fp = fopen(filename, "ae");

        if (log_fp == nullptr) {

            PLOG(ERROR) << "fopen \"" << filename << "\" failed";

            close(pipefd[0]);
@@ -419,11 +419,11 @@ static void copy_log_file_to_pmsg(const char* source, const char* destination) { 
static off_t tmplog_offset = 0;



static void copy_log_file(const char* source, const char* destination, bool append) {

    FILE* dest_fp = fopen_path(destination, append ? "a" : "w");

  FILE* dest_fp = fopen_path(destination, append ? "ae" : "we");

  if (dest_fp == nullptr) {

    PLOG(ERROR) << "Can't open " << destination;

  } else {

        FILE* source_fp = fopen(source, "r");

    FILE* source_fp = fopen(source, "re");

    if (source_fp != nullptr) {

      if (append) {

        fseeko(source_fp, tmplog_offset, SEEK_SET);  // Since last write
@@ -488,7 +488,7 @@ static void finish_recovery() { 
    if (!locale.empty() && has_cache) {

        LOG(INFO) << "Saving locale \"" << locale << "\"";



        FILE* fp = fopen_path(LOCALE_FILE, "w");

        FILE* fp = fopen_path(LOCALE_FILE, "we");

        if (!android::base::WriteStringToFd(locale, fileno(fp))) {

            PLOG(ERROR) << "Failed to save locale to " << LOCALE_FILE;

        }
@@ -552,7 +552,7 @@ static bool erase_volume(const char* volume) { 
            }



            std::string data(sb.st_size, '\0');

            FILE* f = fopen(path.c_str(), "rb");

            FILE* f = fopen(path.c_str(), "rbe");

            fread(&data[0], 1, data.size(), f);

            fclose(f);
@@ -580,7 +580,7 @@ static bool erase_volume(const char* volume) { 
      ui->Print("Failed to make convert_fbe dir %s\n", strerror(errno));

      return true;

    }

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

    FILE* f = fopen(CONVERT_FBE_FILE, "wbe");

    if (!f) {

      ui->Print("Failed to convert to file encryption %s\n", strerror(errno));

      return true;

tests/component/updater_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ TEST_F(UpdaterTest, block_image_update) { 
  UpdaterInfo updater_info;

  updater_info.package_zip = handle;

  TemporaryFile temp_pipe;

  updater_info.cmd_pipe = fopen(temp_pipe.path, "wb");

  updater_info.cmd_pipe = fopen(temp_pipe.path, "wbe");

  updater_info.package_zip_addr = map.addr;

  updater_info.package_zip_len = map.length;
@@ -561,7 +561,7 @@ TEST_F(UpdaterTest, new_data_short_write) { 
  UpdaterInfo updater_info;

  updater_info.package_zip = handle;

  TemporaryFile temp_pipe;

  updater_info.cmd_pipe = fopen(temp_pipe.path, "wb");

  updater_info.cmd_pipe = fopen(temp_pipe.path, "wbe");

  updater_info.package_zip_addr = map.addr;

  updater_info.package_zip_len = map.length;