summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-06-10 03:04:02 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-10 03:04:02 +0200
commit5b7047e2207c83681be18b4f564d7d090b41e5a1 (patch)
tree3b20e6b78d23009d1a69ee81e434957267ed8efa
parentMerge "update_verifier: Verify blocks" am: 5614437de3 am: b71f7757be am: b53f8264ce am: 5118fa7e0b am: f3a51bf0bb (diff)
parentMerge "Fix logical bugs around access() POSIX call" am: e50efc781a am: f6f84d04b2 am: c1d2c3514c am: d72b556518 (diff)
downloadandroid_bootable_recovery-5b7047e2207c83681be18b4f564d7d090b41e5a1.tar
android_bootable_recovery-5b7047e2207c83681be18b4f564d7d090b41e5a1.tar.gz
android_bootable_recovery-5b7047e2207c83681be18b4f564d7d090b41e5a1.tar.bz2
android_bootable_recovery-5b7047e2207c83681be18b4f564d7d090b41e5a1.tar.lz
android_bootable_recovery-5b7047e2207c83681be18b4f564d7d090b41e5a1.tar.xz
android_bootable_recovery-5b7047e2207c83681be18b4f564d7d090b41e5a1.tar.zst
android_bootable_recovery-5b7047e2207c83681be18b4f564d7d090b41e5a1.zip
-rw-r--r--recovery-persist.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/recovery-persist.cpp b/recovery-persist.cpp
index ad101ede2..55699b24e 100644
--- a/recovery-persist.cpp
+++ b/recovery-persist.cpp
@@ -77,6 +77,10 @@ static void copy_file(const char* source, const char* destination) {
}
}
+static bool file_exists(const char* filename) {
+ return access(filename, R_OK) == 0;
+}
+
static bool rotated = false;
ssize_t logsave(
@@ -141,7 +145,7 @@ int main(int argc, char **argv) {
if (has_cache) {
// Collects and reports the non-a/b update metrics from last_install; and removes the file
// to avoid duplicate report.
- if (access(LAST_INSTALL_FILE_IN_CACHE, F_OK) && unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) {
+ if (file_exists(LAST_INSTALL_FILE_IN_CACHE) && unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) {
PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE_IN_CACHE;
}
@@ -152,9 +156,9 @@ int main(int argc, char **argv) {
}
}
- /* Is there something in pmsg? */
- if (access(LAST_PMSG_FILE, R_OK)) {
- return 0;
+ /* Is there something in pmsg? If not, no need to proceed. */
+ if (!file_exists(LAST_PMSG_FILE)) {
+ return 0;
}
// Take last pmsg file contents and send it off to the logsave
@@ -164,18 +168,18 @@ int main(int argc, char **argv) {
// For those device without /cache, the last_install file has been copied to
// /data/misc/recovery from pmsg. Looks for the sideload history only.
if (!has_cache) {
- if (access(LAST_INSTALL_FILE, F_OK) && unlink(LAST_INSTALL_FILE) == -1) {
+ if (file_exists(LAST_INSTALL_FILE) && unlink(LAST_INSTALL_FILE) == -1) {
PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE;
}
}
/* Is there a last console log too? */
if (rotated) {
- if (!access(LAST_CONSOLE_FILE, R_OK)) {
- copy_file(LAST_CONSOLE_FILE, LAST_KMSG_FILE);
- } else if (!access(ALT_LAST_CONSOLE_FILE, R_OK)) {
- copy_file(ALT_LAST_CONSOLE_FILE, LAST_KMSG_FILE);
- }
+ if (file_exists(LAST_CONSOLE_FILE)) {
+ copy_file(LAST_CONSOLE_FILE, LAST_KMSG_FILE);
+ } else if (file_exists(ALT_LAST_CONSOLE_FILE)) {
+ copy_file(ALT_LAST_CONSOLE_FILE, LAST_KMSG_FILE);
+ }
}
return 0;