diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-03-09 15:39:36 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-03-09 15:39:36 +0000 |
| commit | 180ebf02081087eec625a25c785985f5d6b5eff4 (patch) | |
| tree | 7d995692ed6007c747da0caa2b189aadfac91917 /cmd-new-session.c | |
| parent | 514a723f7489123371bded176355ead48f338ae0 (diff) | |
| parent | 92434b0afdf9cf04f1067c4e782b3132002b267a (diff) | |
| download | rtmux-180ebf02081087eec625a25c785985f5d6b5eff4.tar.gz rtmux-180ebf02081087eec625a25c785985f5d6b5eff4.tar.bz2 rtmux-180ebf02081087eec625a25c785985f5d6b5eff4.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-new-session.c')
| -rw-r--r-- | cmd-new-session.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index 08fc6065..a5b197b0 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -78,7 +78,6 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) char **argv, *cause, *cp; int detached, already_attached, idx, argc; u_int sx, sy; - struct format_tree *ft; struct environ_entry *envent; struct cmd_find_state fs; @@ -155,10 +154,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) /* Get the new session working directory. */ if (args_has(args, 'c')) { - ft = format_create(item, FORMAT_NONE, 0); - format_defaults(ft, c, NULL, NULL, NULL); - to_free = cwd = format_expand(ft, args_get(args, 'c')); - format_free(ft); + cwd = args_get(args, 'c'); + to_free = cwd = format_single(item, cwd, c, NULL, NULL, NULL); } else if (c != NULL && c->session == NULL && c->cwd != NULL) cwd = c->cwd; else @@ -322,15 +319,9 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) if (args_has(args, 'P')) { if ((template = args_get(args, 'F')) == NULL) template = NEW_SESSION_TEMPLATE; - - ft = format_create(item, FORMAT_NONE, 0); - format_defaults(ft, c, s, NULL, NULL); - - cp = format_expand(ft, template); + cp = format_single(item, template, c, s, NULL, NULL); cmdq_print(item, "%s", cp); free(cp); - - format_free(ft); } if (!detached) |