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

Commit 59fe878c authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 3b7261d5: am ed32594d: am 2cb9994c: Merge "dumpstate: remove unnecessary mkdir"

* commit '3b7261d5':
  dumpstate: remove unnecessary mkdir
parents 70b6b3d3 3b7261d5
Loading
Loading
Loading
Loading
+0 −18
Original line number Original line Diff line number Diff line
@@ -626,24 +626,6 @@ const char *dump_traces() {
        return NULL;  // Can't rename old traces.txt -- no permission? -- leave it alone instead
        return NULL;  // Can't rename old traces.txt -- no permission? -- leave it alone instead
    }
    }


    /* make the directory if necessary */
    char anr_traces_dir[PATH_MAX];
    strlcpy(anr_traces_dir, traces_path, sizeof(anr_traces_dir));
    char *slash = strrchr(anr_traces_dir, '/');
    if (slash != NULL) {
        *slash = '\0';
        if (!mkdir(anr_traces_dir, 0775)) {
            chown(anr_traces_dir, AID_SYSTEM, AID_SYSTEM);
            chmod(anr_traces_dir, 0775);
            if (selinux_android_restorecon(anr_traces_dir, 0) == -1) {
                fprintf(stderr, "restorecon failed for %s: %s\n", anr_traces_dir, strerror(errno));
            }
        } else if (errno != EEXIST) {
            fprintf(stderr, "mkdir(%s): %s\n", anr_traces_dir, strerror(errno));
            return NULL;
        }
    }

    /* create a new, empty traces.txt file to receive stack dumps */
    /* create a new, empty traces.txt file to receive stack dumps */
    int fd = TEMP_FAILURE_RETRY(open(traces_path, O_CREAT | O_WRONLY | O_TRUNC | O_NOFOLLOW | O_CLOEXEC,
    int fd = TEMP_FAILURE_RETRY(open(traces_path, O_CREAT | O_WRONLY | O_TRUNC | O_NOFOLLOW | O_CLOEXEC,
                                     0666));  /* -rw-rw-rw- */
                                     0666));  /* -rw-rw-rw- */