Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-15 06:24:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

env_get_pwd_slash to return L"/" if $PWD is empty or missing

Browse source 
Prior to this change, env_get_pwd_slash() would try to infer the PWD from
getcwd() if $PWD were missing. But this results env_get_pwd_slash() doing
something radically different than $PWD, and also is a lot of code for a
scenario that cannot be reliably reproduced. Just return "/" in this case.
This commit is contained in:
ridiculousfish 2018-09-28 20:09:45 -04:00
parent dd8c4cfb33
commit 7a0e72bfa9
1 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/env.cpp
View file

@ -697,37 +697,13 @@ void env_set_read_limit() {
} }
wcstring env_get_pwd_slash() { wcstring env_get_pwd_slash() {
// Return "/" if PWD is missing.
// See https://github.com/fish-shell/fish-shell/issues/5080
auto pwd_var = env_get(L"PWD"); auto pwd_var = env_get(L"PWD");
wcstring pwd; wcstring pwd;
if (!pwd_var.missing_or_empty()) { if (!pwd_var.missing_or_empty()) {
pwd = pwd_var->as_string(); pwd = pwd_var->as_string();
} }
else {
// Not sure how we can end up here, but it's possible.
// See https://github.com/fish-shell/fish-shell/issues/5080
// Perhaps it can happen on some platforms if the path is too long?
std::vector<char> path;
bool cwd_success = false;
for (int i = 1; !cwd_success && i <= 10; ++i) {
path.resize(PATH_MAX * i);
if (getcwd(&path[0], PATH_MAX * i) == nullptr) {
if (errno == ERANGE) {
// buffer is not big enough, try again (up to a point)
continue;
}
debug(1, "getcwd() failed with errno %d", errno);
// . but with a trailing slash, because that's what this function does
return L"./";
}
cwd_success = true;
}
if (!cwd_success) {
debug(1, "getcwd() path too long!");
return L"./";
}
pwd = str2wcstring(path.data());
}
if (!string_suffixes_string(L"/", pwd)) { if (!string_suffixes_string(L"/", pwd)) {
pwd.push_back(L'/'); pwd.push_back(L'/');
} }