diff options
| author | Jim Ingham <jingham@apple.com> | 2014-09-12 22:59:05 +0000 |
|---|---|---|
| committer | Jim Ingham <jingham@apple.com> | 2014-09-12 22:59:05 +0000 |
| commit | 2614db1a130bee7d261d4cea1734b3d379092992 (patch) | |
| tree | c6caf54fab29873dca57219294c12c10f035f037 /lldb/source/Host/common/FileSpec.cpp | |
| parent | 7506dc06f4c57cdd99d11a6f76f76ed9e4227e4f (diff) | |
| download | bcm5719-llvm-2614db1a130bee7d261d4cea1734b3d379092992.tar.gz bcm5719-llvm-2614db1a130bee7d261d4cea1734b3d379092992.zip | |
ResolveUsername should resolve "~" to the user's home directory as well as "~/". This
gets command-line file completion from ~ working again.
llvm-svn: 217719
Diffstat (limited to 'lldb/source/Host/common/FileSpec.cpp')
| -rw-r--r-- | lldb/source/Host/common/FileSpec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp index 8c4014c074f..d011d39d88d 100644 --- a/lldb/source/Host/common/FileSpec.cpp +++ b/lldb/source/Host/common/FileSpec.cpp @@ -66,9 +66,9 @@ FileSpec::ResolveUsername (llvm::SmallVectorImpl<char> &path) llvm::StringRef path_str(path.data()); size_t slash_pos = path_str.find_first_of("/", 1); - if (slash_pos == 1) + if (slash_pos == 1 || path_str.size() == 1) { - // A path of the form ~/ resolves to the current user's home dir + // A path of the form ~ or ~/ resolves to the current user's home dir llvm::SmallString<64> home_dir; if (!llvm::sys::path::home_directory(home_dir)) return; |
