github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 17:43:44 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

expand_string should not return any results on error

Browse Source 
Fixes #2796
This commit is contained in:
ridiculousfish 2016-03-05 21:50:05 -08:00
parent a37d4d809e
commit 6bee85fefa
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/expand.cpp
View File

@ -1908,13 +1908,15 @@ expand_error_t expand_string(const wcstring &input, std::vector<completion_t> *o
output_storage.clear(); output_storage.clear();
} }
/* Hack to un-expand tildes (see #647) */ if (total_result != EXPAND_ERROR)
if (!(flags & EXPAND_SKIP_HOME_DIRECTORIES))
{ {
unexpand_tildes(input, &completions); /* Hack to un-expand tildes (see #647) */
if (!(flags & EXPAND_SKIP_HOME_DIRECTORIES))
{
unexpand_tildes(input, &completions);
}
out_completions->insert(out_completions->end(), completions.begin(), completions.end());
} }
out_completions->insert(out_completions->end(), completions.begin(), completions.end());
return total_result; return total_result;
} }