circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-09-10 12:01:10 +01:00
parent 31a6e5eff4 5cdc1bdd32
commit 3358c9a8f1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd-parse.y
View File

@@ -749,6 +749,8 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd,
struct cmd_parse_command *last; struct cmd_parse_command *last;
char *alias, *name, *cause; char *alias, *name, *cause;
if (pi->flags & CMD_PARSE_NOALIAS)
return (0);
memset(pr, 0, sizeof *pr); memset(pr, 0, sizeof *pr);
first = TAILQ_FIRST(&cmd->arguments); first = TAILQ_FIRST(&cmd->arguments);
@@ -786,9 +788,11 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd,
TAILQ_REMOVE(&cmd->arguments, arg, entry); TAILQ_REMOVE(&cmd->arguments, arg, entry);
TAILQ_INSERT_TAIL(&last->arguments, arg, entry); TAILQ_INSERT_TAIL(&last->arguments, arg, entry);
} }
cmd_parse_log_commands(cmds, __func__); cmd_parse_log_commands(cmds, __func__);
pi->flags |= CMD_PARSE_NOALIAS;
cmd_parse_build_commands(cmds, pi, pr); cmd_parse_build_commands(cmds, pi, pr);
pi->flags &= ~CMD_PARSE_NOALIAS;
return (1); return (1);
} }
@@ -865,7 +869,7 @@ cmd_parse_build_commands(struct cmd_parse_commands *cmds,
pr->cmdlist = cmd_list_new(); pr->cmdlist = cmd_list_new();
return; return;
} }
cmd_parse_log_commands(cmds, __func__); cmd_parse_log_commands(cmds, __func__);
/* /*
* Parse each command into a command list. Create a new command list * Parse each command into a command list. Create a new command list
@@ -1422,7 +1426,7 @@ yylex_token_escape(char **buf, size_t *len)
if (o3 >= '0' && o3 <= '7') { if (o3 >= '0' && o3 <= '7') {
ch = 64 * (ch - '0') + ch = 64 * (ch - '0') +
8 * (o2 - '0') + 8 * (o2 - '0') +
(o3 - '0'); (o3 - '0');
yylex_append1(buf, len, ch); yylex_append1(buf, len, ch);
return (1); return (1);
} }