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

Instantize env_set

Browse Source 
Switch env_set to an instance method on environmnet_t.
This commit is contained in:
ridiculousfish
2018-09-14 00:36:26 -07:00
parent 421fbdd52a
commit c1dd284b3e
19 changed files with 193 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/path.cpp
View File

@@ -266,10 +266,11 @@ wcstring path_apply_working_directory(const wcstring &path, const wcstring &work
static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &custom_error_msg,
bool using_xdg, const wcstring &xdg_var, const wcstring &path,
int saved_errno) {
auto &vars = env_stack_t::globals();
wcstring warning_var_name = L"_FISH_WARNED_" + which_dir;
auto var = env_get(warning_var_name, ENV_GLOBAL | ENV_EXPORT);
auto var = vars.get(warning_var_name, ENV_GLOBAL | ENV_EXPORT);
if (!var) return;
env_set_one(warning_var_name, ENV_GLOBAL | ENV_EXPORT, L"1");
vars.set_one(warning_var_name, ENV_GLOBAL | ENV_EXPORT, L"1");
debug(0, custom_error_msg.c_str());
if (path.empty()) {