diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-09-01 21:14:02 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-01 21:14:02 +0200 |
commit | 2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124 (patch) | |
tree | 8f7aee8dc461322d76a0071c60e8c9ad4227ee64 /recovery.c | |
parent | am 34c98df7: (-s ours) do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master (diff) | |
parent | merge from open-source master (diff) | |
download | android_bootable_recovery-2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124.tar android_bootable_recovery-2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124.tar.gz android_bootable_recovery-2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124.tar.bz2 android_bootable_recovery-2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124.tar.lz android_bootable_recovery-2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124.tar.xz android_bootable_recovery-2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124.tar.zst android_bootable_recovery-2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124.zip |
Diffstat (limited to 'recovery.c')
-rw-r--r-- | recovery.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/recovery.c b/recovery.c index f812e741b..33cbc13d8 100644 --- a/recovery.c +++ b/recovery.c @@ -130,7 +130,6 @@ fopen_root_path(const char *root_path, const char *mode) { if (strchr("wa", mode[0])) dirCreateHierarchy(path, 0777, NULL, 1); FILE *fp = fopen(path, mode); - if (fp == NULL) LOGE("Can't open %s\n", path); return fp; } @@ -228,7 +227,9 @@ finish_recovery(const char *send_intent) // By this point, we're ready to return to the main system... if (send_intent != NULL) { FILE *fp = fopen_root_path(INTENT_FILE, "w"); - if (fp != NULL) { + if (fp == NULL) { + LOGE("Can't open %s\n", INTENT_FILE); + } else { fputs(send_intent, fp); check_and_fclose(fp, INTENT_FILE); } @@ -236,7 +237,9 @@ finish_recovery(const char *send_intent) // Copy logs to cache so the system can find out what happened. FILE *log = fopen_root_path(LOG_FILE, "a"); - if (log != NULL) { + if (log == NULL) { + LOGE("Can't open %s\n", LOG_FILE); + } else { FILE *tmplog = fopen(TEMPORARY_LOG_FILE, "r"); if (tmplog == NULL) { LOGE("Can't open %s\n", TEMPORARY_LOG_FILE); |