circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-06 02:48:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-04-25 14:01:16 +01:00
commit 6ac39d5cdb
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd-if-shell.c
View File

@ -31,7 +31,6 @@
static enum cmd_retval cmd_if_shell_exec(struct cmd *, struct cmdq_item *); static enum cmd_retval cmd_if_shell_exec(struct cmd *, struct cmdq_item *);
static enum cmd_retval cmd_if_shell_error(struct cmdq_item *, void *);
static void cmd_if_shell_callback(struct job *); static void cmd_if_shell_callback(struct job *);
static void cmd_if_shell_free(void *); static void cmd_if_shell_free(void *);
@ -138,17 +137,6 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_WAIT); return (CMD_RETURN_WAIT);
} }
static enum cmd_retval
cmd_if_shell_error(struct cmdq_item *item, void *data)
{
char *error = data;
cmdq_error(item, "%s", error);
free(error);
return (CMD_RETURN_NORMAL);
}
static void static void
cmd_if_shell_callback(struct job *job) cmd_if_shell_callback(struct job *job)
{ {
@ -168,9 +156,9 @@ cmd_if_shell_callback(struct job *job)
cmdlist = cmd_string_parse(cmd, file, line, &cause); cmdlist = cmd_string_parse(cmd, file, line, &cause);
if (cmdlist == NULL) { if (cmdlist == NULL) {
if (cause != NULL) if (cause != NULL && cdata->item != NULL)
new_item = cmdq_get_callback(cmd_if_shell_error, cause); cmdq_error(cdata->item, "%s", cause);
else free(cause);
new_item = NULL; new_item = NULL;
} else { } else {
new_item = cmdq_get_command(cmdlist, NULL, &cdata->mouse, 0); new_item = cmdq_get_command(cmdlist, NULL, &cdata->mouse, 0);