circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Handle empty current directory more gracefully.

Browse Source
This commit is contained in:
nicm
2013-11-22 20:58:36 +00:00
parent 72a4602b88
commit 7aeb4473ad
3 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd-new-session.c
View File

@@ -107,13 +107,16 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
cp = format_expand(ft, args_get(args, 'c')); cp = format_expand(ft, args_get(args, 'c'));
format_free(ft); format_free(ft);
fd = open(cp, O_RDONLY|O_DIRECTORY); if (cp != NULL && *cp != '\0') {
free(cp); fd = open(cp, O_RDONLY|O_DIRECTORY);
if (fd == -1) { free(cp);
cmdq_error(cmdq, "bad working directory: %s", if (fd == -1) {
strerror(errno)); cmdq_error(cmdq, "bad working directory: %s",
return (CMD_RETURN_ERROR); strerror(errno));
} return (CMD_RETURN_ERROR);
}
} else if (cp != NULL)
free(cp);
cwd = fd; cwd = fd;
} else if (c != NULL && c->session == NULL) } else if (c != NULL && c->session == NULL)
cwd = c->cwd; cwd = c->cwd;

17
cmd-new-window.c
View File

@@ -117,13 +117,16 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
cp = format_expand(ft, args_get(args, 'c')); cp = format_expand(ft, args_get(args, 'c'));
format_free(ft); format_free(ft);
fd = open(cp, O_RDONLY|O_DIRECTORY); if (cp != NULL && *cp != '\0') {
free(cp); fd = open(cp, O_RDONLY|O_DIRECTORY);
if (fd == -1) { free(cp);
cmdq_error(cmdq, "bad working directory: %s", if (fd == -1) {
strerror(errno)); cmdq_error(cmdq, "bad working directory: %s",
return (CMD_RETURN_ERROR); strerror(errno));
} return (CMD_RETURN_ERROR);
}
} else if (cp != NULL)
free(cp);
cwd = fd; cwd = fd;
} else if (cmdq->client != NULL && cmdq->client->session == NULL) } else if (cmdq->client != NULL && cmdq->client->session == NULL)
cwd = cmdq->client->cwd; cwd = cmdq->client->cwd;

17
cmd-split-window.c
View File

@@ -95,13 +95,16 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
cp = format_expand(ft, args_get(args, 'c')); cp = format_expand(ft, args_get(args, 'c'));
format_free(ft); format_free(ft);
fd = open(cp, O_RDONLY|O_DIRECTORY); if (cp != NULL && *cp != '\0') {
free(cp); fd = open(cp, O_RDONLY|O_DIRECTORY);
if (fd == -1) { free(cp);
cmdq_error(cmdq, "bad working directory: %s", if (fd == -1) {
strerror(errno)); cmdq_error(cmdq, "bad working directory: %s",
return (CMD_RETURN_ERROR); strerror(errno));
} return (CMD_RETURN_ERROR);
}
} else if (cp != NULL)
free(cp);
cwd = fd; cwd = fd;
} else if (cmdq->client != NULL && cmdq->client->session == NULL) } else if (cmdq->client != NULL && cmdq->client->session == NULL)
cwd = cmdq->client->cwd; cwd = cmdq->client->cwd;