[Lldb-commits] [lldb] r154621 - in /lldb/branches/lldb-platform-work/source: Plugins/Platform/POSIX/PlatformPOSIX.cpp Target/Platform.cpp

[Johnny Chen]

Author: johnny
Date: Thu Apr 12 17:01:42 2012
New Revision: 154621

URL: http://llvm.org/viewvc/llvm-project?rev=154621&view=rev
Log:
Also dumps the rysnc/ssh thingy as part of the command output for the 'platform connect' command when platform is connected.

Modified:
    lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
    lldb/branches/lldb-platform-work/source/Target/Platform.cpp

Modified: lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp?rev=154621&r1=154620&r2=154621&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp Thu Apr 12 17:01:42 2012
@@ -115,7 +115,7 @@
     {   LLDB_OPT_SET_ALL, false, "rsync-opts"             , 'R', required_argument, NULL, 0, eArgTypeCommandName  , "Platform-specific options required for rsync to work." },
     {   LLDB_OPT_SET_ALL, false, "ssh"                    , 's', no_argument,       NULL, 0, eArgTypeNone         , "Enable SSH." },
     {   LLDB_OPT_SET_ALL, false, "ssh-opts"               , 'S', required_argument, NULL, 0, eArgTypeCommandName  , "Platform-specific options required for SSH to work." },
-    {   LLDB_OPT_SET_ALL, false, "ignore-remote-hostname" , 'i', no_argument,       NULL, 0, eArgTypeNone         , "Do not automatically fill in the remote hostname for the rsync command." },
+    {   LLDB_OPT_SET_ALL, false, "ignore-remote-hostname" , 'i', no_argument,       NULL, 0, eArgTypeNone         , "Do not automatically fill in the remote hostname when composing the rsync command." },
     {   0,                false, NULL                     ,  0 , 0                , NULL, 0, eArgTypeNone         , NULL }
 };
 

Modified: lldb/branches/lldb-platform-work/source/Target/Platform.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Target/Platform.cpp?rev=154621&r1=154620&r2=154621&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Target/Platform.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Target/Platform.cpp Thu Apr 12 17:01:42 2012
@@ -257,6 +257,19 @@
             strm.Printf("  Hostname: %s\n", GetHostname());
         strm.Printf(" Connected: %s\n", is_connected ? "yes" : "no");
     }
+
+    if (!IsConnected())
+        return;
+
+    // The platform is connected, dump the rsync and ssh options, too.
+    strm.Printf("With rsync: %s", GetSupportsRSync() ? "yes" : "no");
+    if (GetSupportsRSync())
+    {
+        strm.Printf(" (option: %s", (GetRSyncOpts() && strlen(GetRSyncOpts()) != 0) ? GetRSyncOpts() : "none");
+        strm.Printf(", ignore hostname: %s)", GetIgnoresRemoteHostname() ? "yes" : "no");
+    }
+    strm.Printf("\n");
+    strm.Printf("  With ssh: %s\n", GetSupportsSSH() ? "yes" : "no");
 }