xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not expand env vars in parse_filename

Browse Source 
We have far enough ways to provide that feature, through the shell
or through regular expands.
Fixes #1545
This commit is contained in:
Maxime Coste 2017-08-29 08:33:00 +07:00
parent 5b43c46b75
commit 9001580c9b
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/file.cc
View File

@ -48,32 +48,10 @@ public:
String parse_filename(StringView filename) String parse_filename(StringView filename)
{ {
if (filename.length() >= 1 and filename[0_byte] == '~' and auto prefix = filename.substr(0_byte, 2_byte);
(filename.length() == 1 or filename[1_byte] == '/')) if (prefix == "~" or prefix == "~/")
return parse_filename("$HOME" + filename.substr(1_byte)); return getenv("HOME") + filename.substr(1_byte);
return filename.str();
ByteCount pos = 0;
String result;
for (ByteCount i = 0; i < filename.length(); ++i)
{
if (filename[i] == '$' and (i == 0 or filename[i-1] != '\\'))
{
result += filename.substr(pos, i - pos);
ByteCount end = i+1;
while (end != filename.length() and is_word(filename[end]))
++end;
StringView var_name = filename.substr(i+1, end - i - 1);
const char* var_value = getenv(var_name.zstr());
if (var_value)
result += var_value;
pos = end;
}
}
if (pos != filename.length())
result += filename.substr(pos);
return result;
} }
std::pair<StringView, StringView> split_path(StringView path) std::pair<StringView, StringView> split_path(StringView path)