mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-11-10 00:01:19 +00:00
parent 6f3b6c8d92 384736e955
commit 515da63d2b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
window.c
View File

@@ -939,10 +939,13 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
proc_clear_signals(server_proc, 1); proc_clear_signals(server_proc, 1);
sigprocmask(SIG_SETMASK, &oldset, NULL); sigprocmask(SIG_SETMASK, &oldset, NULL);
if (chdir(wp->cwd) != 0) { cwd = NULL;
if ((home = find_home()) == NULL || chdir(home) != 0) if (chdir(wp->cwd) == 0)
cwd = wp->cwd;
else if ((home = find_home()) != NULL && chdir(home) == 0)
cwd = home;
else
chdir("/"); chdir("/");
}
if (tcgetattr(STDIN_FILENO, &tio2) != 0) if (tcgetattr(STDIN_FILENO, &tio2) != 0)
fatal("tcgetattr failed"); fatal("tcgetattr failed");
@@ -960,6 +963,8 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
if (path != NULL) if (path != NULL)
environ_set(env, "PATH", "%s", path); environ_set(env, "PATH", "%s", path);
if (cwd != NULL)
environ_set(env, "PWD", "%s", cwd);
environ_set(env, "TMUX_PANE", "%%%u", wp->id); environ_set(env, "TMUX_PANE", "%%%u", wp->id);
environ_push(env); environ_push(env);