commit 18d2d656bda78c90ee33e6eae98ffb88fc978da4
author JP Abgrall <jpa@google.com> Tue Apr 12 22:01:58 2011 -0700
committer JP Abgrall <jpa@google.com> Tue Apr 12 22:01:58 2011 -0700
tree dad7e2a417396596db666c1debc151a5d34e8b46
parent 5fe38b9399c504c71ab1150746ffcd70593aec0f

adb: Don't allow a forced exit if data is still in the socket


Fixes the  http://b/4271011 "adb shell cat /init.rc output gets truncated"


Change-Id: I6df64374b60789595fb18f96d429315dec032443
Signed-off-by: JP Abgrall <jpa@google.com>

sockets.c

diff --git a/sockets.c b/sockets.c
index c3c4ac2..45d935c 100644
--- a/sockets.c
+++ b/sockets.c
@@ -360,8 +360,8 @@
                 fdevent_del(&s->fde, FDE_READ);
             }
         }
-
-        if(s->fde.force_eof || is_eof) {
+        /* Don't allow a forced eof if data is still there */
+        if((s->fde.force_eof && !r) || is_eof) {
             s->close(s);
         }
     }