Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-02-19 10:01:19 +00:00
2 changed files with 8 additions and 8 deletions

View File

@ -377,10 +377,10 @@ spawn_pane(struct spawn_context *sc, char **cause)
* Child process. Change to the working directory or home if that
* fails.
*/
if (chdir(new_wp->cwd) != 0) {
if ((tmp = find_home()) == NULL || chdir(tmp) != 0)
chdir("/");
}
if (chdir(new_wp->cwd) != 0 &&
((tmp = find_home()) == NULL || chdir(tmp) != 0) &&
chdir("/") != 0)
fatal("chdir failed");
/*
* Update terminal escape characters from the session if available and