github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-15 23:22:53 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

realpath: Use the parser's working dir

Browse Source 
Future proofing, similar to what we do in `path resolve`.
This commit is contained in:
Fabian Boehm 2022-07-12 20:53:57 +02:00
parent 526b7e3b1b
commit cc632d6ae9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/builtins/realpath.cpp
View File

@ -12,6 +12,8 @@
#include "../common.h"
#include "../fallback.h" // IWYU pragma: keep
#include "../io.h"
#include "../parser.h"
#include "../path.h"
#include "../wcstringutil.h"
#include "../wgetopt.h"
#include "../wutil.h" // IWYU pragma: keep
@ -99,7 +101,7 @@ maybe_t<int> builtin_realpath(parser_t &parser, io_streams_t &streams, const wch
return STATUS_CMD_ERROR;
}
} else {
wcstring absolute_arg = string_prefixes_string(L"/", arg) ? arg : wgetcwd() + L"/" + arg;
wcstring absolute_arg = string_prefixes_string(L"/", arg) ? arg : path_apply_working_directory(arg, parser.vars().get_pwd_slash());
streams.out.append(normalize_path(absolute_arg, /* allow leading double slashes */ false));
}