Pass normalized target file paths via GDB-remote to a target and denormalize them on the target.

ovyalov · ovyalov · commit 7d9d941b9b66 · 2015-04-16T07:02:56.000Z
http://reviews.llvm.org/D8980 llvm-svn: 235077
diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@@ -206,7 +206,7 @@ PlatformRemoteGDBServer::GetModuleSpec (const FileSpec& module_file_spec,
 {
     Log *log = GetLogIfAnyCategoriesSet (LIBLLDB_LOG_PLATFORM);
 
-    const auto module_path = module_file_spec.GetPath ();
+    const auto module_path = module_file_spec.GetPath (false);
 
     if (!m_gdb_client.GetModuleInfo (module_file_spec, arch, module_spec))
     {
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -3230,7 +3230,7 @@ GDBRemoteCommunicationClient::OpenFile (const lldb_private::FileSpec& file_spec,
 {
     lldb_private::StreamString stream;
     stream.PutCString("vFile:open:");
-    std::string path (file_spec.GetPath());
+    std::string path (file_spec.GetPath(false));
     if (path.empty())
         return UINT64_MAX;
     stream.PutCStringAsRawHex8(path.c_str());
@@ -3711,7 +3711,7 @@ GDBRemoteCommunicationClient::GetModuleInfo (const FileSpec& module_file_spec,
                                              const lldb_private::ArchSpec& arch_spec,
                                              ModuleSpec &module_spec)
 {
-    std::string module_path = module_file_spec.GetPath ();
+    std::string module_path = module_file_spec.GetPath (false);
     if (module_path.empty ())
         return false;
 
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
@@ -576,7 +576,8 @@ GDBRemoteCommunicationServerCommon::Handle_vFile_Open (StringExtractorGDBRemote
             {
                 mode_t mode = packet.GetHexMaxU32(false, 0600);
                 Error error;
-                int fd = ::open (path.c_str(), flags, mode);
+                const FileSpec path_spec(path.c_str(), true);
+                int fd = ::open (path_spec.GetPath().c_str(), flags, mode);
                 const int save_errno = fd == -1 ? errno : 0;
                 StreamString response;
                 response.PutChar('F');
@@ -1162,7 +1163,8 @@ GDBRemoteCommunicationServerCommon::Handle_qModuleInfo (StringExtractorGDBRemote
     packet.GetHexByteString(triple);
     ArchSpec arch(triple.c_str());
 
-    const FileSpec module_path_spec = FindModuleFile(module_path, arch);
+    const FileSpec req_module_path_spec(module_path.c_str(), true);
+    const FileSpec module_path_spec = FindModuleFile(req_module_path_spec.GetPath(), arch);
     const ModuleSpec module_spec(module_path_spec, arch);
 
     ModuleSpecList module_specs;

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ PlatformRemoteGDBServer::GetModuleSpec (const FileSpec& module_file_spec,`
`206`	`206`	`{`
`207`	`207`	`Log *log = GetLogIfAnyCategoriesSet (LIBLLDB_LOG_PLATFORM);`
`208`	`208`
`209`		`- const auto module_path = module_file_spec.GetPath ();`
	`209`	`+ const auto module_path = module_file_spec.GetPath (false);`
`210`	`210`
`211`	`211`	`if (!m_gdb_client.GetModuleInfo (module_file_spec, arch, module_spec))`
`212`	`212`	`{`