=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-confirm-before.c,v retrieving revision 1.35 retrieving revision 1.36 diff -c -r1.35 -r1.36 *** src/usr.bin/tmux/cmd-confirm-before.c 2017/05/17 15:20:23 1.35 --- src/usr.bin/tmux/cmd-confirm-before.c 2019/05/20 11:46:06 1.36 *************** *** 1,4 **** ! /* $OpenBSD: cmd-confirm-before.c,v 1.35 2017/05/17 15:20:23 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha --- 1,4 ---- ! /* $OpenBSD: cmd-confirm-before.c,v 1.36 2019/05/20 11:46:06 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha *************** *** 82,98 **** return (CMD_RETURN_NORMAL); } - static enum cmd_retval - cmd_confirm_before_error(struct cmdq_item *item, void *data) - { - char *error = data; - - cmdq_error(item, "%s", error); - free(error); - - return (CMD_RETURN_NORMAL); - } - static int cmd_confirm_before_callback(struct client *c, void *data, const char *s, __unused int done) --- 82,87 ---- *************** *** 112,122 **** cmdlist = cmd_string_parse(cdata->cmd, NULL, 0, &cause); if (cmdlist == NULL) { ! if (cause != NULL) { ! new_item = cmdq_get_callback(cmd_confirm_before_error, ! cause); ! } else new_item = NULL; } else { new_item = cmdq_get_command(cmdlist, NULL, NULL, 0); cmd_list_free(cmdlist); --- 101,111 ---- cmdlist = cmd_string_parse(cdata->cmd, NULL, 0, &cause); if (cmdlist == NULL) { ! if (cause != NULL) ! new_item = cmdq_get_error(cause); ! else new_item = NULL; + free(cause); } else { new_item = cmdq_get_command(cmdlist, NULL, NULL, 0); cmd_list_free(cmdlist);