summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-run-shell.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-02-05 10:29:43 +0000
committernicm <nicm@openbsd.org>2015-02-05 10:29:43 +0000
commitf426771eab9e2362a30890108867d3e8ac72113a (patch)
treea29c739b6286417a527b2a9ab5372ba4fa486e28 /usr.bin/tmux/cmd-run-shell.c
parentimplement SIOCIFAFATTACH and SIOCIFAFDETACH for AF_INET (diff)
downloadwireguard-openbsd-f426771eab9e2362a30890108867d3e8ac72113a.tar.xz
wireguard-openbsd-f426771eab9e2362a30890108867d3e8ac72113a.zip
Wrap all the individual format_* calls in a single format_defaults
functions.
Diffstat (limited to 'usr.bin/tmux/cmd-run-shell.c')
-rw-r--r--usr.bin/tmux/cmd-run-shell.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/tmux/cmd-run-shell.c b/usr.bin/tmux/cmd-run-shell.c
index ac91d1c6d78..2189686d352 100644
--- a/usr.bin/tmux/cmd-run-shell.c
+++ b/usr.bin/tmux/cmd-run-shell.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-run-shell.c,v 1.26 2014/10/20 22:29:25 nicm Exp $ */
+/* $OpenBSD: cmd-run-shell.c,v 1.27 2015/02/05 10:29:43 nicm Exp $ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -93,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);