1
0
mirror of https://github.com/tmux/tmux.git synced 2025-04-22 20:38:48 +00:00

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2024-11-18 10:01:12 +00:00
commit 2dce45f427

View File

@ -223,9 +223,16 @@ assignment : EQUALS
{ {
struct cmd_parse_state *ps = &parse_state; struct cmd_parse_state *ps = &parse_state;
int flags = ps->input->flags; int flags = ps->input->flags;
int flag = 1;
struct cmd_parse_scope *scope;
if ((~flags & CMD_PARSE_PARSEONLY) && if (ps->scope != NULL) {
(ps->scope == NULL || ps->scope->flag)) flag = ps->scope->flag;
TAILQ_FOREACH(scope, &ps->stack, entry)
flag = flag && scope->flag;
}
if ((~flags & CMD_PARSE_PARSEONLY) && flag)
environ_put(global_environ, $1, 0); environ_put(global_environ, $1, 0);
free($1); free($1);
} }
@ -234,9 +241,16 @@ hidden_assignment : HIDDEN EQUALS
{ {
struct cmd_parse_state *ps = &parse_state; struct cmd_parse_state *ps = &parse_state;
int flags = ps->input->flags; int flags = ps->input->flags;
int flag = 1;
struct cmd_parse_scope *scope;
if ((~flags & CMD_PARSE_PARSEONLY) && if (ps->scope != NULL) {
(ps->scope == NULL || ps->scope->flag)) flag = ps->scope->flag;
TAILQ_FOREACH(scope, &ps->stack, entry)
flag = flag && scope->flag;
}
if ((~flags & CMD_PARSE_PARSEONLY) && flag)
environ_put(global_environ, $2, ENVIRON_HIDDEN); environ_put(global_environ, $2, ENVIRON_HIDDEN);
free($2); free($2);
} }