am 22d79a5c: make offsets in firmware update header not point to bad blocks
Merge commit '22d79a5c5eab9c1e86ff2af210bb072689e2d630' into eclair-plus-aosp
* commit '22d79a5c5eab9c1e86ff2af210bb072689e2d630':
make offsets in firmware update header not point to bad blocks
diff --git a/recovery.c b/recovery.c
index 5b3f6e5..4385307 100644
--- a/recovery.c
+++ b/recovery.c
@@ -131,7 +131,6 @@
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;
}
@@ -229,7 +228,9 @@
// 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);
}
@@ -237,7 +238,9 @@
// 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);