diff options
Diffstat (limited to 'window.c')
| -rw-r--r-- | window.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -309,7 +309,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; @@ -675,7 +675,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; @@ -730,7 +730,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); @@ -738,7 +738,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]; @@ -757,9 +757,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); @@ -774,7 +774,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) |