Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

add missing special-case for ../

Browse source 
When I reviewed the fix for #952 I noted that "../" wasn't handled but in my
haste to merge it forgot to augment the pull-request.
This commit is contained in:
Kurtis Rader 2016-04-08 15:52:10 -07:00
parent 6c5f923a47
commit 6adc35c636
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/expand.cpp
View file

@ -1818,8 +1818,9 @@ static expand_error_t expand_stage_wildcards(const wcstring &input, std::vector<
In either case, we ignore the path if we start with ./ or /. In either case, we ignore the path if we start with ./ or /.
Also ignore it if we are doing command completion and we contain a slash, per IEEE 1003.1, chapter 8 under PATH Also ignore it if we are doing command completion and we contain a slash, per IEEE 1003.1, chapter 8 under PATH
*/ */
if (string_prefixes_string(L"./", path_to_expand) || if (string_prefixes_string(L"/", path_to_expand) ||
string_prefixes_string(L"/", path_to_expand) || string_prefixes_string(L"./", path_to_expand) ||
string_prefixes_string(L"../", path_to_expand) ||
(for_command && path_to_expand.find(L'/') != wcstring::npos)) (for_command && path_to_expand.find(L'/') != wcstring::npos))
{ {
effective_working_dirs.push_back(working_dir); effective_working_dirs.push_back(working_dir);