From a6b340af123b82e3aaa33cb2a0d45f637eeb4759 Mon Sep 17 00:00:00 2001 From: Spencer Low Date: Wed, 29 Jul 2015 17:21:21 -0700 Subject: [PATCH] fix adb {forward,reverse} --no-rebind adb forward --no-rebind (and the matching reverse command) seem to have been broken by 424af02f363a305a349ff99e1cc253ac5bc642c9. I fixed-up the string parsing and also fixed the error message not to include strerror(errno) since that does not apply because it is an application-level error that doesn't have anything to do with the OS/libc. Change-Id: Iba7286283bfcf1782076355edcd9c355c0a0edfd Signed-off-by: Spencer Low --- adb/adb.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adb/adb.cpp b/adb/adb.cpp index 97ce12562..aa9ef55a1 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -770,12 +770,12 @@ int handle_forward_request(const char* service, TransportType type, const char* if (android::base::StartsWith(service, "killforward:")) { kill_forward = true; service += 12; + } else { + service += 8; // skip past "forward:" if (android::base::StartsWith(service, "norebind:")) { no_rebind = true; service += 9; } - } else { - service += 8; } std::vector pieces = android::base::Split(service, ";"); @@ -824,7 +824,7 @@ int handle_forward_request(const char* service, TransportType type, const char* message = android::base::StringPrintf("cannot bind to socket: %s", strerror(errno)); break; case INSTALL_STATUS_CANNOT_REBIND: - message = android::base::StringPrintf("cannot rebind existing socket: %s", strerror(errno)); + message = android::base::StringPrintf("cannot rebind existing socket"); break; case INSTALL_STATUS_LISTENER_NOT_FOUND: message = android::base::StringPrintf("listener '%s' not found", service);