From 6b2009ad725b662853b8e94aee233fabdc5490f9 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 8 Mar 2017 13:36:12 +0000
Subject: Add a helper function for the most common
 format_create/defaults/expand pattern.

---
 cmd-if-shell.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'cmd-if-shell.c')

diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index ec4bf68e..f7d95d53 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -69,10 +69,10 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 	char				*shellcmd, *cmd, *cause;
 	struct cmd_list			*cmdlist;
 	struct cmdq_item		*new_item;
+	struct client			*c = item->state.c;
 	struct session			*s = item->state.tflag.s;
 	struct winlink			*wl = item->state.tflag.wl;
 	struct window_pane		*wp = item->state.tflag.wp;
-	struct format_tree		*ft;
 	const char			*cwd;
 
 	if (item->client != NULL && item->client->session == NULL)
@@ -82,11 +82,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 	else
 		cwd = NULL;
 
-	ft = format_create(item, FORMAT_NONE, 0);
-	format_defaults(ft, item->state.c, s, wl, wp);
-	shellcmd = format_expand(ft, args->argv[0]);
-	format_free(ft);
-
+	shellcmd = format_single(item, args->argv[0], c, s, wl, wp);
 	if (args_has(args, 'F')) {
 		cmd = NULL;
 		if (*shellcmd != '0' && *shellcmd != '\0')
-- 
cgit v1.2.3