diff options
Diffstat (limited to 'cmd-run-shell.c')
| -rw-r--r-- | cmd-run-shell.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/cmd-run-shell.c b/cmd-run-shell.c index f5231814..5d6d178b 100644 --- a/cmd-run-shell.c +++ b/cmd-run-shell.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $OpenBSD$ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -40,7 +40,6 @@ const struct cmd_entry cmd_run_shell_entry = { "bt:", 1, 1, "[-b] " CMD_TARGET_PANE_USAGE " shell-command", 0, - NULL, cmd_run_shell_exec }; @@ -94,12 +93,7 @@ cmd_run_shell_exec(struct cmd *self, struct cmd_q *cmdq) } ft = format_create(); - if (s != NULL) - format_session(ft, s); - if (s != NULL && wl != NULL) - format_winlink(ft, s, wl); - if (wp != NULL) - format_window_pane(ft, wp); + format_defaults(ft, NULL, s, wl, wp); shellcmd = format_expand(ft, args->argv[0]); format_free(ft); @@ -161,13 +155,9 @@ cmd_run_shell_callback(struct job *job) retcode = WTERMSIG(job->status); xasprintf(&msg, "'%s' terminated by signal %d", cmd, retcode); } - if (msg != NULL) { - if (lines == 0) - cmdq_info(cmdq, "%s", msg); - else - cmd_run_shell_print(job, msg); - free(msg); - } + if (msg != NULL) + cmd_run_shell_print(job, msg); + free(msg); } void |