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

Only inherit a PWD if it resolves to "."

Browse Source 
Fixes #5647
This commit is contained in:
ridiculousfish
2019-02-18 13:11:01 -08:00
parent 8e41e3337c
commit 59cb2d02a8
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/env.cpp
View File

@@ -1014,11 +1014,13 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
}
// initialize the PWD variable if necessary
// Note we may inherit a virtual PWD that doesn't match what getcwd would return; respect that.
// Note we treat PWD as read-only so it was not set in vars.
const char *incoming_pwd = getenv("PWD");
if (incoming_pwd && incoming_pwd[0]) {
vars.set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, str2wcstring(incoming_pwd));
// Note we may inherit a virtual PWD that doesn't match what getcwd would return; respect that
// if and only if it matches getcwd (#5647). Note we treat PWD as read-only so it was not set in
// vars.
const char *incoming_pwd_cstr = getenv("PWD");
wcstring incoming_pwd = incoming_pwd_cstr ? str2wcstring(incoming_pwd_cstr) : wcstring{};
if (!incoming_pwd.empty() && paths_are_same_file(incoming_pwd, L".")) {
vars.set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, incoming_pwd);
} else {
vars.set_pwd_from_getcwd();
}