diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-01-31 21:39:56 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-01-31 21:39:56 +0000 |
| commit | d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987 (patch) | |
| tree | 397f4999444c2eef367f884b815bec2a14697c3c /cmd-split-window.c | |
| parent | cbf9224c5f7bcf07352f6ea128c90c12cb0af22e (diff) | |
| parent | 9f02feb9d089b1a4639afb52ab0e8212eeb55a7c (diff) | |
| download | rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.gz rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.bz2 rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
cmd-server-info.c
cmd-start-server.c
Diffstat (limited to 'cmd-split-window.c')
| -rw-r--r-- | cmd-split-window.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c index 4bb069f0..c43cb96b 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -94,13 +94,16 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) cp = format_expand(ft, args_get(args, 'c')); format_free(ft); - fd = open(cp, O_RDONLY|O_DIRECTORY); - free(cp); - if (fd == -1) { - cmdq_error(cmdq, "bad working directory: %s", - strerror(errno)); - return (CMD_RETURN_ERROR); - } + if (cp != NULL && *cp != '\0') { + fd = open(cp, O_RDONLY|O_DIRECTORY); + free(cp); + if (fd == -1) { + cmdq_error(cmdq, "bad working directory: %s", + strerror(errno)); + return (CMD_RETURN_ERROR); + } + } else if (cp != NULL) + free(cp); cwd = fd; } else if (cmdq->client != NULL && cmdq->client->session == NULL) cwd = cmdq->client->cwd; |