h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-24 17:41:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Always return absolute path in path_get_cdpath

Browse Source 
Fixes #6220
This commit is contained in:
Johannes Altmanninger
2019-10-17 21:15:43 +02:00
parent 868eba5e80
commit 5e274066e3
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/path.cpp
View File

@@ -161,8 +161,7 @@ maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
const environment_t &env_vars) {
int err = ENOENT;
if (dir.empty()) return none();
assert(wd.empty() || wd.back() == L'/');
assert(!wd.empty() && wd.back() == L'/');
wcstring_list_t paths;
if (dir.at(0) == L'/') {
// Absolute path.
@@ -181,14 +180,16 @@ maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
cdpathsv.push_back(L".");
for (wcstring next_path : cdpathsv) {
if (next_path.empty()) next_path = L".";
if (next_path == L"." && !wd.empty()) {
if (next_path == L".") {
// next_path is just '.', and we have a working directory, so use the wd instead.
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()) {
// We want to return an absolute path (see issue 6220)
if (string_prefixes_string(L"./", next_path)) {
next_path = next_path.replace(0, 2, wd);
} else if (string_prefixes_string(L"../", next_path) || next_path == L"..") {
next_path = next_path.insert(0, wd);
}
expand_tilde(next_path, env_vars);