[Lldb-commits] [PATCH] D62219: [FileSystem] Fix regression in FileSystem::Resolve
Jonas Devlieghere via Phabricator via lldb-commits
lldb-commits at lists.llvm.org
Tue May 21 14:55:13 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rLLDB361321: [FileSystem] Fix regression in FileSystem::Resolve (authored by JDevlieghere, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D62219?vs=200585&id=200593#toc
Repository:
rLLDB LLDB
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D62219/new/
https://reviews.llvm.org/D62219
Files:
source/Host/common/FileSystem.cpp
Index: source/Host/common/FileSystem.cpp
===================================================================
--- source/Host/common/FileSystem.cpp
+++ source/Host/common/FileSystem.cpp
@@ -241,17 +241,21 @@
if (path.empty())
return;
- // Resolve tilde.
- SmallString<128> original_path(path.begin(), path.end());
+ // Resolve tilde in path.
+ SmallString<128> resolved(path.begin(), path.end());
StandardTildeExpressionResolver Resolver;
- Resolver.ResolveFullPath(original_path, path);
+ Resolver.ResolveFullPath(llvm::StringRef(path.begin(), path.size()),
+ resolved);
// Try making the path absolute if it exists.
- SmallString<128> absolute_path(path.begin(), path.end());
- MakeAbsolute(path);
- if (!Exists(path)) {
- path.clear();
- path.append(original_path.begin(), original_path.end());
+ SmallString<128> absolute(resolved.begin(), resolved.end());
+ MakeAbsolute(absolute);
+
+ path.clear();
+ if (Exists(absolute)) {
+ path.append(absolute.begin(), absolute.end());
+ } else {
+ path.append(resolved.begin(), resolved.end());
}
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D62219.200593.patch
Type: text/x-patch
Size: 1119 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20190521/2bc799c2/attachment.bin>
More information about the lldb-commits
mailing list