summaryrefslogtreecommitdiffstats
path: root/cmd-attach-session.c
diff options
context:
space:
mode:
authornicm <nicm>2017-03-08 13:36:12 +0000
committernicm <nicm>2017-03-08 13:36:12 +0000
commit6b2009ad725b662853b8e94aee233fabdc5490f9 (patch)
treea38064466deb34fce243a7051e0139afc6c56080 /cmd-attach-session.c
parent1e6e606f54537c732cce48e5d3eae7fc29281fe5 (diff)
Add a helper function for the most common format_create/defaults/expand
pattern.
Diffstat (limited to 'cmd-attach-session.c')
-rw-r--r--cmd-attach-session.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index e9c23df3..079b22f3 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -54,8 +54,7 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag,
struct client *c = item->client, *c_loop;
struct winlink *wl = item->state.tflag.wl;
struct window_pane *wp = item->state.tflag.wp;
- char *cause, *cwd;
- struct format_tree *ft;
+ char *cause;
if (RB_EMPTY(&sessions)) {
cmdq_error(item, "no sessions");
@@ -77,13 +76,8 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag,
}
if (cflag != NULL) {
- ft = format_create(item, FORMAT_NONE, 0);
- format_defaults(ft, c, s, wl, wp);
- cwd = format_expand(ft, cflag);
- format_free(ft);
-
free((void *)s->cwd);
- s->cwd = cwd;
+ s->cwd = format_single(item, cflag, c, s, wl, wp);
}
if (c->session != NULL) {