github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-23 06:37:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Display error message on set -e PROTECTED

Browse Source 
Previously unsetting a variable would fail silently. Now sharing error
printing code from regular `set PROTECTED` call.
This commit is contained in:
Mahmoud Al-Qudsi 2018-03-31 21:44:54 -05:00
parent abcc9647da
commit 0e0168ef18
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/builtin_set.cpp
View File

@ -279,15 +279,8 @@ static bool validate_path_warning_on_colons(const wchar_t *cmd,
return any_success; return any_success;
} }
/// Call env_set. If this is a path variable, e.g. PATH, validate the elements. On error, print a static void handle_env_return(int retval, const wchar_t *cmd, const wchar_t *key, io_streams_t &streams)
/// description of the problem to stderr. {
static int my_env_set(const wchar_t *cmd, const wchar_t *key, int scope, wcstring_list_t &list,
io_streams_t &streams) {
if (is_path_variable(key) && !validate_path_warning_on_colons(cmd, key, list, streams)) {
return STATUS_CMD_ERROR;
}
int retval = env_set(key, scope | ENV_USER, list);
switch (retval) { switch (retval) {
case ENV_OK: { case ENV_OK: {
retval = STATUS_CMD_OK; retval = STATUS_CMD_OK;
@ -301,14 +294,14 @@ static int my_env_set(const wchar_t *cmd, const wchar_t *key, int scope, wcstrin
} }
case ENV_SCOPE: { case ENV_SCOPE: {
streams.err.append_format( streams.err.append_format(
_(L"%ls: Tried to set the special variable '%ls' with the wrong scope\n"), cmd, _(L"%ls: Tried to modify the special variable '%ls' with the wrong scope\n"), cmd,
key); key);
retval = STATUS_CMD_ERROR; retval = STATUS_CMD_ERROR;
break; break;
} }
case ENV_INVALID: { case ENV_INVALID: {
streams.err.append_format( streams.err.append_format(
_(L"%ls: Tried to set the special variable '%ls' to an invalid value\n"), cmd, key); _(L"%ls: Tried to modify the special variable '%ls' to an invalid value\n"), cmd, key);
retval = STATUS_CMD_ERROR; retval = STATUS_CMD_ERROR;
break; break;
} }
@ -317,6 +310,18 @@ static int my_env_set(const wchar_t *cmd, const wchar_t *key, int scope, wcstrin
break; break;
} }
} }
}
/// Call env_set. If this is a path variable, e.g. PATH, validate the elements. On error, print a
/// description of the problem to stderr.
static int my_env_set(const wchar_t *cmd, const wchar_t *key, int scope, wcstring_list_t &list,
io_streams_t &streams) {
if (is_path_variable(key) && !validate_path_warning_on_colons(cmd, key, list, streams)) {
return STATUS_CMD_ERROR;
}
int retval = env_set(key, scope | ENV_USER, list);
handle_env_return(retval, cmd, key, streams);
return retval; return retval;
} }
@ -626,6 +631,8 @@ static int builtin_set_erase(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
retval = my_env_set(cmd, dest, scope, result, streams); retval = my_env_set(cmd, dest, scope, result, streams);
} }
handle_env_return(retval, cmd, dest, streams);
if (retval != STATUS_CMD_OK) return retval; if (retval != STATUS_CMD_OK) return retval;
return check_global_scope_exists(cmd, opts, dest, streams); return check_global_scope_exists(cmd, opts, dest, streams);
} }

2
src/env.cpp
View File

@ -1248,7 +1248,7 @@ int env_remove(const wcstring &key, int var_mode) {
int erased = 0; int erased = 0;
if ((var_mode & ENV_USER) && is_read_only(key)) { if ((var_mode & ENV_USER) && is_read_only(key)) {
return 2; return ENV_SCOPE;
} }
first_node = vars_stack().top.get(); first_node = vars_stack().top.get();