github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-27 03:13:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve: Use the new real path

Browse Source 
This failed for

/bin/foo/bar

if /bin is a symlink to /usr/bin and foo doesn't exist.

It returned /bin/foo/bar instead of the correct /usr/bin/foo/bar.
This commit is contained in:
Fabian Homborg 2022-02-02 19:25:40 +01:00
parent 80e04a1e86
commit d13ba046b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/builtins/path.cpp
View File

@ -643,9 +643,9 @@ static int path_resolve(parser_t &parser, io_streams_t &streams, int argc, const
next = wdirname(next);
real = wrealpath(next);
if (real) {
next.push_back(L'/');
next.append(rest);
real = normalize_path(next, false);
real->push_back(L'/');
real->append(rest);
real = normalize_path(*real, false);
break;
}
rest = wbasename(next) + L'/' + rest;