commit b7d18a0db1b6a8b3ea602c02dee7df0f5b3c85cc
author Greg Hackmann <ghackmann@google.com> Mon Mar 17 20:51:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 17 20:51:45 2014 +0000
tree 94ce5bf812039f9a9a47547b7ab5fe98e2199cfc
parent d84869fbb8589430981ba19d2d1cbc9ef58b8df3
parent 998e022748876bc36905ba39e4825a4b634dc9d7

am 998e0227: Merge "liblog: improve errno handling on read failure"

* commit '998e022748876bc36905ba39e4825a4b634dc9d7':
  liblog: improve errno handling on read failure

liblog/log_read.c

diff --git a/liblog/log_read.c b/liblog/log_read.c
index d96f129..2dd07e6 100644
--- a/liblog/log_read.c
+++ b/liblog/log_read.c
@@ -272,11 +272,11 @@
                             const char *msg, char *buf, size_t buf_size)
 {
     ssize_t ret;
+    int errno_save = 0;
     int sock = socket_local_client("logd", ANDROID_SOCKET_NAMESPACE_RESERVED,
                                    SOCK_STREAM);
     if (sock < 0) {
-        ret = sock;
-        goto done;
+        return sock;
     }
 
     if (msg) {
@@ -292,9 +292,12 @@
 
 done:
     if ((ret == -1) && errno) {
-        ret = -errno;
+        errno_save = errno;
     }
     close(sock);
+    if (errno_save) {
+        errno = errno_save;
+    }
     return ret;
 }
 
@@ -305,6 +308,7 @@
     }
 
     if (strncmp(buf, "success", 7)) {
+        errno = EINVAL;
         return -1;
     }