Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove more ENV_NULL references

Browse source
This commit is contained in:
Kurtis Rader 2017-08-10 15:20:53 -07:00
parent 559b05d01d
commit 591449aba7
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/builtin_set.cpp
View file

@ -293,8 +293,6 @@ static int my_env_set(const wchar_t *cmd, const wchar_t *key, const wcstring_lis
if (retval != STATUS_CMD_OK) return retval; if (retval != STATUS_CMD_OK) return retval;
} }
// We don't check `val->empty()` because an array var with a single empty string will be
// "empty". A truly empty array var is set to the special value `ENV_NULL`.
auto val = list_to_array_val(list); auto val = list_to_array_val(list);
retval = env_set(key, val->c_str(), scope | ENV_USER); retval = env_set(key, val->c_str(), scope | ENV_USER);
switch (retval) { switch (retval) {

10
src/expand.cpp
View file

@ -1172,16 +1172,8 @@ static void expand_home_directory(wcstring &input) {
if (username.empty()) { if (username.empty()) {
// Current users home directory. // Current users home directory.
home = env_get(L"HOME"); home = env_get(L"HOME");
// If home is either missing or empty,
// treat it like an empty list.
// $HOME is defined to be a _path_,
// and those cannot be empty.
//
// We do not expand a string-empty var differently,
// because that results in bogus paths
// - ~/foo turns into /foo.
if (home.missing_or_empty()) { if (home.missing_or_empty()) {
input = ENV_NULL; input.clear();
return; return;
} }
tail_idx = 1; tail_idx = 1;