mirror of
https://github.com/tmux/tmux.git
synced 2024-11-18 18:38:54 +00:00
Merge branch 'obsd-master' into master
This commit is contained in:
commit
7fe3588e49
@ -127,7 +127,7 @@ args_parse(const struct args_parse *parse, struct args_value *values,
|
|||||||
u_int count)
|
u_int count)
|
||||||
{
|
{
|
||||||
struct args *args;
|
struct args *args;
|
||||||
u_int i;
|
u_int i;
|
||||||
struct args_value *value, *new;
|
struct args_value *value, *new;
|
||||||
u_char flag, argument;
|
u_char flag, argument;
|
||||||
const char *found, *string, *s;
|
const char *found, *string, *s;
|
||||||
@ -497,11 +497,13 @@ args_make_commands_now(struct cmd *self, struct cmdq_item *item, u_int idx)
|
|||||||
|
|
||||||
state = args_make_commands_prepare(self, item, idx, NULL, 0, 0);
|
state = args_make_commands_prepare(self, item, idx, NULL, 0, 0);
|
||||||
cmdlist = args_make_commands(state, 0, NULL, &error);
|
cmdlist = args_make_commands(state, 0, NULL, &error);
|
||||||
args_make_commands_free(state);
|
|
||||||
if (cmdlist == NULL) {
|
if (cmdlist == NULL) {
|
||||||
cmdq_error(item, "%s", error);
|
cmdq_error(item, "%s", error);
|
||||||
free(error);
|
free(error);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
cmdlist->references++;
|
||||||
|
args_make_commands_free(state);
|
||||||
return (cmdlist);
|
return (cmdlist);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user