generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-24 10:59:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1361 from CosminCremarenco-Murex/tilde-expansion

Browse Source 
Shell expansion rules say that tilde must be replaced with $HOME before calling getpwuid
This commit is contained in:
Günter Obiltschnig 2016-08-27 08:27:38 +02:00 committed by GitHub
commit 63b3e23049
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Foundation/src/Path_UNIX.cpp
View File

@ -204,7 +204,19 @@ std::string PathImpl::expandImpl(const std::string& path)
++it; ++it;
if (it != end && *it == '/') if (it != end && *it == '/')
{ {
result += homeImpl(); ++it; const char* homeEnv = getenv("HOME");
if (homeEnv)
{
result += homeEnv;
std::string::size_type resultSize = result.size();
if (resultSize > 0 && result[resultSize - 1] != '/')
result.append("/");
}
else
{
result += homeImpl();
}
++it;
} }
else result += '~'; else result += '~';
} }