diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-07-21 12:01:16 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-07-21 12:01:16 +0100 |
| commit | e725b96a591ff269ad73946ac16b7f8fd3d0d2d9 (patch) | |
| tree | aca06ded5e5bd6d8f00922e304a0191f4a55c9ae /cmd-new-session.c | |
| parent | acbbc93501eea6732bdca3ca9f39589b867c6b68 (diff) | |
| parent | 11e2af6df76e7384b4dcd20ea3b42ccba8e72310 (diff) | |
| download | rtmux-e725b96a591ff269ad73946ac16b7f8fd3d0d2d9.tar.gz rtmux-e725b96a591ff269ad73946ac16b7f8fd3d0d2d9.tar.bz2 rtmux-e725b96a591ff269ad73946ac16b7f8fd3d0d2d9.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-new-session.c')
| -rw-r--r-- | cmd-new-session.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index efddc228..81c2f467 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -74,8 +74,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) struct termios tio, *tiop; struct session_group *sg; const char *newname, *errstr, *template, *group, *prefix; - const char *path, *cmd, *cwd, *to_free = NULL; - char **argv, *cause, *cp; + const char *path, *cmd, *cwd; + char **argv, *cause, *cp, *to_free = NULL; int detached, already_attached, idx, argc; int is_control = 0; u_int sx, sy; @@ -151,7 +151,8 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) /* Get the new session working directory. */ if (args_has(args, 'c')) { cwd = args_get(args, 'c'); - to_free = cwd = format_single(item, cwd, c, NULL, NULL, NULL); + to_free = format_single(item, cwd, c, NULL, NULL, NULL); + cwd = to_free; } else if (c != NULL && c->session == NULL && c->cwd != NULL) cwd = c->cwd; else @@ -327,16 +328,13 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) cmd_find_from_session(&item->shared->current, s); } - if (to_free != NULL) - free((void *)to_free); - cmd_find_from_session(&fs, s); hooks_insert(s->hooks, item, &fs, "after-new-session"); + free(to_free); return (CMD_RETURN_NORMAL); error: - if (to_free != NULL) - free((void *)to_free); + free(to_free); return (CMD_RETURN_ERROR); } |