commit 2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124
author Jean-Baptiste Queru <jbq@google.com> Tue Sep 01 12:14:02 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 01 12:14:02 2009 -0700
tree 8f7aee8dc461322d76a0071c60e8c9ad4227ee64
parent 6785c2534ab29a5a4c7e6ac83f53e4e008758ceb
parent cbf903803850deb4f70490d97a1603e7b8679cc2

am cbf90380: merge from open-source master

Merge commit 'cbf903803850deb4f70490d97a1603e7b8679cc2'

* commit 'cbf903803850deb4f70490d97a1603e7b8679cc2':
  Not all failures to fopen_root_path() are serious.

recovery.c

diff --git a/recovery.c b/recovery.c
index f812e74..33cbc13 100644
--- a/recovery.c
+++ b/recovery.c
@@ -130,7 +130,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;
 }
 
@@ -228,7 +227,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);
         }
@@ -236,7 +237,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);