[Lldb-commits] [lldb] r221907 - Remove extra "/" character from paths resolved in iOS SDKs and also be sure to update the SDK directory infos if needed before we start using m_sdk_directory_infos.

[Greg Clayton]

Author: gclayton
Date: Thu Nov 13 12:25:33 2014
New Revision: 221907

URL: http://llvm.org/viewvc/llvm-project?rev=221907&view=rev
Log:
Remove extra "/" character from paths resolved in iOS SDKs and also be sure to update the SDK directory infos if needed before we start using m_sdk_directory_infos.


Modified:
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp?rev=221907&r1=221906&r2=221907&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp Thu Nov 13 12:25:33 2014
@@ -582,7 +582,7 @@ PlatformRemoteiOS::GetFileInSDKRoot (con
         {
             ::snprintf (resolved_path, 
                         sizeof(resolved_path), 
-                        "%s/%s", 
+                        "%s%s",
                         sdkroot_path,
                         platform_file_path);
             
@@ -593,7 +593,7 @@ PlatformRemoteiOS::GetFileInSDKRoot (con
             
         ::snprintf (resolved_path,
                     sizeof(resolved_path), 
-                    "%s/Symbols.Internal/%s", 
+                    "%s/Symbols.Internal%s",
                     sdkroot_path,
                     platform_file_path);
         
@@ -602,7 +602,7 @@ PlatformRemoteiOS::GetFileInSDKRoot (con
             return true;
         ::snprintf (resolved_path,
                     sizeof(resolved_path), 
-                    "%s/Symbols/%s", 
+                    "%s/Symbols%s", 
                     sdkroot_path, 
                     platform_file_path);
         
@@ -694,6 +694,8 @@ PlatformRemoteiOS::GetSharedModule (cons
     if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path)))
     {
         FileSpec local_file;
+        UpdateSDKDirectoryInfosInNeeded();
+
         const uint32_t num_sdk_infos = m_sdk_directory_infos.size();
         // Try the last SDK index if it is set as most files from an SDK
         // will tend to be valid in that same SDK.