Fixed up lldb-gdbserver to match slightly different debugserver listener host:port message.

Fixed up typo in lldb-gdbserver name missed when working on the OS X side earlier today for debugserver support.

llvm-svn: 207398

2 files changed, 11 insertions, 2 deletions

diff --git a/lldb/test/tools/lldb-gdbserver/lldbgdbserverutils.py b/lldb/test/tools/lldb-gdbserver/lldbgdbserverutils.py
index e91f82f1ce8..4ead9805ff6 100644
--- a/lldb/test/tools/lldb-gdbserver/lldbgdbserverutils.py
+++ b/lldb/test/tools/lldb-gdbserver/lldbgdbserverutils.py
@@ -58,7 +58,7 @@ def get_lldb_gdbserver_exe():
     if not lldb_exe:
         return None
     else:
-        return _get_debug_monitor_from_lldb(lldb_exe, "lldb-gedbserver")
+        return _get_debug_monitor_from_lldb(lldb_exe, "lldb-gdbserver")
 
 def get_debugserver_exe():
     """Return the debugserver exe path.
diff --git a/lldb/tools/lldb-gdbserver/lldb-gdbserver.cpp b/lldb/tools/lldb-gdbserver/lldb-gdbserver.cpp
index fa91542e530..ee5e57e9bae 100644
--- a/lldb/tools/lldb-gdbserver/lldb-gdbserver.cpp
+++ b/lldb/tools/lldb-gdbserver/lldb-gdbserver.cpp
@@ -332,16 +332,25 @@ main (int argc, char *argv[])
         if (conn_ap.get())
         {
             std::string final_host_and_port;
+            std::string listening_host;
+            std::string listening_port;
 
             // If host_and_port starts with ':', default the host to be "localhost" and expect the remainder to be the port.
             if (host_and_port[0] == ':')
                 final_host_and_port.append ("localhost");
             final_host_and_port.append (host_and_port);
 
+            const std::string::size_type colon_pos = final_host_and_port.find(':');
+            if (colon_pos != std::string::npos)
+            {
+                listening_host = final_host_and_port.substr(0, colon_pos);
+                listening_port = final_host_and_port.substr(colon_pos + 1);
+            }
+
             std::string connect_url ("listen://");
             connect_url.append (final_host_and_port);
 
-            printf ("Listening for a connection on %s...\n", final_host_and_port.c_str ());
+            printf ("Listening to port %s for a connection from %s...\n", listening_port.c_str (), listening_host.c_str ());
             if (conn_ap->Connect(connect_url.c_str(), &error) == eConnectionStatusSuccess)
             {
                 printf ("Connection established.\n");