github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-25 21:39:49 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

set: Print an error when setting a special var in the wrong scope

Browse Source 
When attempting to set a readonly or electric variable in the local or
universal scopes, print an appropriate error. Similarly, print an error
when setting an electric variable as exported. In most cases this is
simply a nicer error instead of the 'read-only' one, but for the 'umask'
variable it prevents `set -l umask 0023` from silently changing the
global value.
This commit is contained in:
Kevin Ballard 2014-07-12 14:05:42 -07:00
parent d9bed68fe9
commit 2457997cd9
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin_set.cpp
View File

@ -157,6 +157,13 @@ static int my_env_set(const wchar_t *key, const wcstring_list_t &val, int scope)
break;
}
case ENV_SCOPE:
{
append_format(stderr_buffer, _(L"%ls: Tried to set the special variable '%ls' with the wrong scope\n"), L"set", key);
retcode=1;
break;
}
case ENV_INVALID:
{
append_format(stderr_buffer, _(L"%ls: Unknown error"), L"set");

9
env.cpp
View File

@ -634,6 +634,15 @@ int env_set(const wcstring &key, const wchar_t *val, int var_mode)
}
}
if ((var_mode & (ENV_LOCAL | ENV_UNIVERSAL)) && (is_read_only(key) || is_electric(key)))
{
return ENV_SCOPE;
}
if ((var_mode & ENV_EXPORT) && is_electric(key))
{
return ENV_SCOPE;
}
if ((var_mode & ENV_USER) && is_read_only(key))
{
return ENV_PERM;

2
env.h
View File

@ -49,6 +49,7 @@
enum
{
ENV_PERM = 1,
ENV_SCOPE,
ENV_INVALID
}
;
@ -82,6 +83,7 @@ void env_init(const struct config_paths_t *paths = NULL);
The current error codes are:
* ENV_PERM, can only be returned when setting as a user, e.g. ENV_USER is set. This means that the user tried to change a read-only variable.
* ENV_SCOPE, the variable cannot be set in the given scope. This applies to readonly/electric variables set from the local or universal scopes, or set as exported.
* ENV_INVALID, the variable name or mode was invalid
*/