Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-08-20 22:01:46 +01:00
44 changed files with 431 additions and 390 deletions

View File

@ -81,7 +81,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
}
/* If no pipe command, that is enough. */
if (args->argc == 0 || *args->argv[0] == '\0')
if (args_count(args) == 0 || *args_string(args, 0) == '\0')
return (CMD_RETURN_NORMAL);
/*
@ -111,7 +111,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
/* Expand the command. */
ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
format_defaults(ft, tc, s, wl, wp);
cmd = format_expand_time(ft, args->argv[0]);
cmd = format_expand_time(ft, args_string(args, 0));
format_free(ft);
/* Fork the child. */