am a6597598: Merge "fix adb {forward,reverse} --no-rebind"
* commit 'a6597598a0b82759960df09fd173192ca8c82f0c':
fix adb {forward,reverse} --no-rebind
diff --git a/adb/adb.cpp b/adb/adb.cpp
index 97ce125..aa9ef55 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -770,12 +770,12 @@
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<std::string> pieces = android::base::Split(service, ";");
@@ -824,7 +824,7 @@
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);