Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-03-17 12:01:28 +00:00
5 changed files with 15 additions and 6 deletions

View File

@ -318,7 +318,7 @@ spawn_pane(struct spawn_context *sc, char **cause)
/* Then the shell. If respawning, use the old one. */
if (~sc->flags & SPAWN_RESPAWN) {
tmp = options_get_string(s->options, "default-shell");
if (*tmp == '\0' || areshell(tmp))
if (!checkshell(tmp))
tmp = _PATH_BSHELL;
free(new_wp->shell);
new_wp->shell = xstrdup(tmp);