From 619ec2f3aadb814cd09e412e832d94d5c4665ea6 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 17 Nov 2008 01:56:05 +0000 Subject: Not all failures to fopen_root_path() are serious. Example: E:Can't open /cache/recovery/command. --- recovery.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recovery.c b/recovery.c index 0408abf92..0ff5d94d0 100644 --- a/recovery.c +++ b/recovery.c @@ -129,7 +129,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; } @@ -218,7 +217,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); } @@ -226,7 +227,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); -- cgit v1.2.3