commit 112445b8a752ce174f36cf853d5f1c356c3f5286
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 59150b2b684d0e830ec2d65b3613b708edba5043
parent f098c159e306105aa64977955887e687112c76c6

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>

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index c3c4ac2..45d935c 100644
--- a/adb/sockets.c
+++ b/adb/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);
         }
     }