h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-22 15:51:18 -03:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if CDPATH is "./"

Browse Source 
Fixes #5887.
This commit is contained in:
Fabian Homborg
2019-05-22 21:46:53 +02:00
parent 363652ad76
commit 1faffa515e
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/path.cpp
View File

@@ -179,9 +179,14 @@ maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
if (next_path.empty()) next_path = L".";
if (next_path == L"." && !wd.empty()) {
// next_path is just '.', and we have a working directory, so use the wd instead.
// TODO: if next_path starts with ./ we need to replace the . with the wd.
next_path = wd;
}
// If next_path starts with ./ we need to replace the . with the wd.
if (string_prefixes_string(L"./", next_path) && !wd.empty()) {
next_path = next_path.replace(0, 2, wd);
}
expand_tilde(next_path, env_vars);
if (next_path.empty()) continue;