Use FileSpec::IsRelativeToCurrentWorkingDirectory instead of llvm::sys::path::is_relative in PlatformAndroid::GetFile

[ovyalov]

Summary

Use FileSpec::IsRelativeToCurrentWorkingDirectory instead of llvm::sys::path::is_relative in PlatformAndroid::GetFile

[chaoren]

LGTM, after these fixes

source/Plugins/Platform/Android/PlatformAndroid.cpp

217–219

Nit: I think we decided to stop having a space between the function name and the parenthesis.

219

s/GetPath (false).c_str ()/GetCString(false)/

[ovyalov]

source/Plugins/Platform/Android/PlatformAndroid.cpp

217–219

Yes, for new code.
For existing code, I assume, we stick to existing file style - PlatformAndroid mostly uses spaces.

219

Done

[ovyalov]

Review fixes.

[ovyalov]

AFFECTED FILES

/lldb/trunk/source/Plugins/Platform/Android/PlatformAndroid.cpp

USERS

ovyalov (Author)

http://reviews.llvm.org/rL238624

source/Plugins/Platform/Android/PlatformAndroid.cpp

 //===-- PlatformAndroid.cpp -------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 // C Includes
 // C++ Includes
 // Other libraries and framework includes
 #include "lldb/Core/Log.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Host/HostInfo.h"
-#include "llvm/Support/Path.h"
 #include "Utility/UriParser.h"
 
 // Project includes
 #include "AdbClient.h"
 #include "PlatformAndroid.h"
 #include "PlatformAndroidRemoteGDBServer.h"
 
 using namespace lldb;

 
 Error
 PlatformAndroid::GetFile (const FileSpec& source,
                           const FileSpec& destination)
 {
     if (IsHost() || !m_remote_platform_sp)
         return PlatformLinux::GetFile(source, destination);
 
-    FileSpec source_spec (source);
-    const auto source_path = source_spec.GetPath (false);
-    if (llvm::sys::path::is_relative (source_path.c_str ()))
-    {
-        source_spec = GetRemoteWorkingDirectory ();
-        source_spec.AppendPathComponent (source_path.c_str ());
-    }
+    FileSpec source_spec (source.GetPath (false), false, FileSpec::ePathSyntaxPosix);
+    if (source_spec.IsRelativeToCurrentWorkingDirectory ())
+        source_spec = GetRemoteWorkingDirectory ().CopyByAppendingPathComponent (source_spec.GetCString (false));
 
     AdbClient adb (m_device_id);
     return adb.PullFile (source_spec, destination);
 }
 
 Error
 PlatformAndroid::PutFile (const FileSpec& source,
                           const FileSpec& destination,