commit aeceb5174502659cb4fff6de924b54ef7e6cdae7
author Benoit Goby <benoit@android.com> Tue Jun 12 12:12:18 2012 -0700
committer Benoit Goby <benoit@android.com> Tue Jun 12 16:14:58 2012 -0700
tree ebdf729b2d0104e279a3376cfb90759ba4dc85f6
parent 0f3974c3d0ee2ffe5e0cb9a56658ba18d511f6ea

adb: Fix adb tcpip command

When running "adb tcpip 5555", adb create a service socket named
"tcpip:5555". Only compare the 6 first chars "tcpip:" to decide if
we enable exit_on_close.

Bug: 6650130
Change-Id: I0835973de044f1cfde0e859ff0277c0ccc2630a3

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index 91db951..cd31b23 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -427,9 +427,9 @@
     D("LS(%d): bound to '%s' via %d\n", s->id, name, fd);
 
 #if !ADB_HOST
-    if ((!strcmp(name, "root:") && getuid() != 0)
-        || !strcmp(name, "usb:")
-        || !strcmp(name, "tcpip:")) {
+    if ((!strncmp(name, "root:", 5) && getuid() != 0)
+        || !strncmp(name, "usb:", 4)
+        || !strncmp(name, "tcpip:", 6)) {
         D("LS(%d): enabling exit_on_close\n", s->id);
         s->exit_on_close = 1;
     }