diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-01-13 14:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-01-13 14:01:13 +0000 |
| commit | 780dd7ac823215f1c3a468816db18ab745b22d49 (patch) | |
| tree | 9e57b7b042c5dac2c1df03f07e5acd6464519b83 /cmd-new-session.c | |
| parent | 2311bbd28a227a8b6e6e52bf30665b37315cad11 (diff) | |
| parent | 08d21936e4559a92174361d7785ca3e967972edb (diff) | |
| download | rtmux-780dd7ac823215f1c3a468816db18ab745b22d49.tar.gz rtmux-780dd7ac823215f1c3a468816db18ab745b22d49.tar.bz2 rtmux-780dd7ac823215f1c3a468816db18ab745b22d49.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-new-session.c')
| -rw-r--r-- | cmd-new-session.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index 8e5520c6..7df7dcb6 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 environ *env; struct termios tio, *tiop; const char *newname, *target, *update, *errstr, *template; - const char *path, *cwd, *to_free = NULL; - char **argv, *cmd, *cause, *cp; + const char *path, *cmd, *cwd, *to_free = NULL; + char **argv, *cause, *cp; int detached, already_attached, idx, argc; u_int sx, sy; struct format_tree *ft; @@ -217,7 +217,7 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item) cmd = options_get_string(global_s_options, "default-command"); if (cmd != NULL && *cmd != '\0') { argc = 1; - argv = &cmd; + argv = (char **)&cmd; } else { argc = 0; argv = NULL; |