circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-25 02:48:47 +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-02 10:01:09 +01:00
commit d776c9acfc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arguments.c
View File

@ -302,10 +302,13 @@ args_copy(struct args *args, int argc, char **argv)
struct args_value *value, *new_value; struct args_value *value, *new_value;
u_int i; u_int i;
cmd_log_argv(argc, argv, "%s", __func__);
new_args = args_create(); new_args = args_create();
RB_FOREACH(entry, args_tree, &args->tree) { RB_FOREACH(entry, args_tree, &args->tree) {
if (entry->count == 1) { if (TAILQ_EMPTY(&entry->values)) {
args_set(new_args, entry->flag, NULL); for (i = 0; i < entry->count; i++)
args_set(new_args, entry->flag, NULL);
continue; continue;
} }
TAILQ_FOREACH(value, &entry->values, entry) { TAILQ_FOREACH(value, &entry->values, entry) {
@ -314,6 +317,8 @@ args_copy(struct args *args, int argc, char **argv)
args_set(new_args, entry->flag, new_value); args_set(new_args, entry->flag, new_value);
} }
} }
if (args->count == 0)
return (new_args);
new_args->count = args->count; new_args->count = args->count;
new_args->values = xcalloc(args->count, sizeof *new_args->values); new_args->values = xcalloc(args->count, sizeof *new_args->values);
for (i = 0; i < args->count; i++) { for (i = 0; i < args->count; i++) {