circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 10:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1127:

Browse Source 
Use default-shell not _PATH_BSHELL to spawn commands, pointed out by
Dennis G?nnewig and Thomas Adam.
This commit is contained in:
Tiago Cunha 2012-05-30 13:47:33 +00:00
parent b24829a99c
commit 2e3a260315
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
window.c
View File

@ -740,23 +740,24 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
clear_signals(1); clear_signals(1);
log_close(); log_close();
if (*wp->cmd != '\0') {
/* Set SHELL but only if it is currently not useful. */
shell = getenv("SHELL");
if (checkshell(shell))
setenv("SHELL", wp->shell, 1); setenv("SHELL", wp->shell, 1);
ptr = strrchr(wp->shell, '/');
execl(_PATH_BSHELL, "sh", "-c", wp->cmd, (char *) NULL); if (*wp->cmd != '\0') {
/* Use the command. */
if (ptr != NULL && *(ptr + 1) != '\0')
xasprintf(&argv0, "%s", ptr + 1);
else
xasprintf(&argv0, "%s", wp->shell);
execl(wp->shell, argv0, "-c", wp->cmd, (char *) NULL);
fatal("execl failed"); fatal("execl failed");
} }
/* No command; fork a login shell. */ /* No command; fork a login shell. */
ptr = strrchr(wp->shell, '/');
if (ptr != NULL && *(ptr + 1) != '\0') if (ptr != NULL && *(ptr + 1) != '\0')
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");
} }