circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-14 02:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 306:

Browse Source 
If forking a login shell or if SHELL is otherwise not useful, set it to the
default shell. Based on a diff from martynas@.
This commit is contained in:
Tiago Cunha 2009-09-02 01:08:32 +00:00
parent b7cb7d10f9
commit 5838ee1263
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
window.c
View File

@ -1,4 +1,4 @@
/* $Id: window.c,v 1.105 2009-09-02 01:02:44 tcunha Exp $ */ /* $Id: window.c,v 1.106 2009-09-02 01:08:32 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -510,6 +510,11 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
log_close(); log_close();
if (*wp->cmd != '\0') { if (*wp->cmd != '\0') {
/* Set SHELL but only if it is currently not useful. */
shell = getenv("SHELL");
if (shell == NULL || *shell == '\0' || areshell(shell))
setenv("SHELL", wp->shell, 1);
execl(_PATH_BSHELL, "sh", "-c", wp->cmd, (char *) NULL); execl(_PATH_BSHELL, "sh", "-c", wp->cmd, (char *) NULL);
fatal("execl failed"); fatal("execl failed");
} }
@ -520,6 +525,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
xasprintf(&argv0, "-%s", ptr + 1); xasprintf(&argv0, "-%s", ptr + 1);
else else
xasprintf(&argv0, "-%s", wp->shell); xasprintf(&argv0, "-%s", wp->shell);
setenv("SHELL", wp->shell, 1);
execl(wp->shell, argv0, (char *) NULL); execl(wp->shell, argv0, (char *) NULL);
fatal("execl failed"); fatal("execl failed");
} }