aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-10-06 21:02:23 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-10-06 21:02:23 +0100
commit4538c269d0b366a770a5a5ebfe0c5007569edbc1 (patch)
tree9fac1bc826683d2187e69c3e748da92a7db6a225 /window.c
parent446eb11cdeba97a24996cee36ba331491aba6211 (diff)
downloadrtmux-4538c269d0b366a770a5a5ebfe0c5007569edbc1.tar.gz
rtmux-4538c269d0b366a770a5a5ebfe0c5007569edbc1.tar.bz2
rtmux-4538c269d0b366a770a5a5ebfe0c5007569edbc1.zip
Alter how tmux handles the working directory to internally use file descriptors
rather than strings. - Each session still has a current working directory. - New sessions still get their working directory from the client that created them or its attached session if any. - New windows are created by default in the session working directory. - The -c flag to new, neww, splitw allows the working directory to be overridden. - The -c flag to attach let's the session working directory be changed. - The default-path option has been removed. To get the equivalent to default-path '.', do: bind c neww -c $PWD To get the equivalent of default-path '', do: bind c neww -c '#{pane_current_path}' The equivalent of default-path '~' is left as an exercise for the reader. This also changes the client identify protocol to be a set of messages rather than one as well as some other changes that should make it easier to make backwards-compatible protocol changes in future.
Diffstat (limited to 'window.c')
-rw-r--r--window.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/window.c b/window.c
index 7912bd37..9f47f444 100644
--- a/window.c
+++ b/window.c
@@ -306,7 +306,7 @@ window_create1(u_int sx, u_int sy)
struct window *
window_create(const char *name, const char *cmd, const char *shell,
- const char *cwd, struct environ *env, struct termios *tio,
+ int cwd, struct environ *env, struct termios *tio,
u_int sx, u_int sy, u_int hlimit, char **cause)
{
struct window *w;
@@ -672,7 +672,7 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit)
wp->cmd = NULL;
wp->shell = NULL;
- wp->cwd = NULL;
+ wp->cwd = -1;
wp->fd = -1;
wp->event = NULL;
@@ -727,7 +727,7 @@ window_pane_destroy(struct window_pane *wp)
RB_REMOVE(window_pane_tree, &all_window_panes, wp);
- free(wp->cwd);
+ close(wp->cwd);
free(wp->shell);
free(wp->cmd);
free(wp);
@@ -735,7 +735,7 @@ window_pane_destroy(struct window_pane *wp)
int
window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
- const char *cwd, struct environ *env, struct termios *tio, char **cause)
+ int cwd, struct environ *env, struct termios *tio, char **cause)
{
struct winsize ws;
char *argv0, paneid[16];
@@ -754,9 +754,9 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
free(wp->shell);
wp->shell = xstrdup(shell);
}
- if (cwd != NULL) {
- free(wp->cwd);
- wp->cwd = xstrdup(cwd);
+ if (cwd != -1) {
+ close(wp->cwd);
+ wp->cwd = dup(cwd);
}
log_debug("spawn: %s -- %s", wp->shell, wp->cmd);
@@ -771,7 +771,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
xasprintf(cause, "%s: %s", cmd, strerror(errno));
return (-1);
case 0:
- if (chdir(wp->cwd) != 0)
+ if (fchdir(wp->cwd) != 0)
chdir("/");
if (tcgetattr(STDIN_FILENO, &tio2) != 0)