forked from OSchip/llvm-project
Nope, I was right originally. ResolveUsername should resolve "~" to the
current user, and ResolvePartialUsername will resolve "~" to the list of users. llvm-svn: 217723
This commit is contained in:
parent
1adba8b6e3
commit
ead45ccc2c
|
@ -56,7 +56,8 @@ GetFileStats (const FileSpec *file_spec, struct stat *stats_ptr)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Resolves the username part of a path of the form ~user/other/directories, and
|
// Resolves the username part of a path of the form ~user/other/directories, and
|
||||||
// writes the result into dst_path.
|
// writes the result into dst_path. This will also resolve "~" to the current user.
|
||||||
|
// If you want to complete "~" to the list of users, pass it to ResolvePartialUsername.
|
||||||
void
|
void
|
||||||
FileSpec::ResolveUsername (llvm::SmallVectorImpl<char> &path)
|
FileSpec::ResolveUsername (llvm::SmallVectorImpl<char> &path)
|
||||||
{
|
{
|
||||||
|
@ -66,7 +67,7 @@ FileSpec::ResolveUsername (llvm::SmallVectorImpl<char> &path)
|
||||||
|
|
||||||
llvm::StringRef path_str(path.data());
|
llvm::StringRef path_str(path.data());
|
||||||
size_t slash_pos = path_str.find_first_of("/", 1);
|
size_t slash_pos = path_str.find_first_of("/", 1);
|
||||||
if (slash_pos == 1)
|
if (slash_pos == 1 || path.size() == 1)
|
||||||
{
|
{
|
||||||
// A path of ~/ resolves to the current user's home dir
|
// A path of ~/ resolves to the current user's home dir
|
||||||
llvm::SmallString<64> home_dir;
|
llvm::SmallString<64> home_dir;
|
||||||
|
|
Loading…
Reference in New Issue