commit 8709684f764143aacbac53f67434e56560e35b24
author Elliott Hughes <enh@google.com> Tue Feb 02 22:47:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 02 22:47:36 2016 +0000
tree 0e98911b2d3c7f86e2b51fdbbe94005b2462b3ed
parent e60aa820e202f20a153f9644668f0bd5550fc68b
parent aba79ac14e4a1b554f34bc9ed52203c1fb576335

Merge "init: Fix load_firmware error"
am: f330e5462d

* commit 'f330e5462d200080d1694834282afadc018060e1':
  init: Fix load_firmware error

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index d556e30..39cd706 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -40,6 +40,7 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 
+#include <android-base/file.h>
 #include <cutils/list.h>
 #include <cutils/uevent.h>
 
@@ -769,21 +770,13 @@
             ret = -1;
             break;
         }
-
-        len_to_copy -= nr;
-        while (nr > 0) {
-            ssize_t nw = 0;
-
-            nw = write(data_fd, buf + nw, nr);
-            if(nw <= 0) {
-                ret = -1;
-                goto out;
-            }
-            nr -= nw;
+        if (!android::base::WriteFully(data_fd, buf, nr)) {
+            ret = -1;
+            break;
         }
+        len_to_copy -= nr;
     }
 
-out:
     if(!ret)
         write(loading_fd, "0", 1);  /* successful end of transfer */
     else