extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-10 06:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 305:

Browse Source 
When using tmux as a login shell, there is currently no way to specify a shell
to be used as a login shell inside tmux, so add a default-shell session option.
This sets the shell invoked as a login shell when the default-command option is
empty.

The default option value is whichever of $SHELL, getpwuid(getuid())'s pw_shell
or /bin/sh is valid first.

Based on a diff from martynas@, changed by me to be a session option rather
than a window option.
This commit is contained in:
Tiago Cunha
2009-09-02 01:02:44 +00:00
parent ce5c441f0f
commit a3a150faf2
9 changed files with 121 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
session.c
View File

@ -1,4 +1,4 @@
/* $Id: session.c,v 1.62 2009-08-16 19:16:27 tcunha Exp $ */
/* $Id: session.c,v 1.63 2009-09-02 01:02:44 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -19,6 +19,7 @@
#include <sys/types.h>
#include <sys/time.h>
#include <paths.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
@ -207,6 +208,7 @@ session_new(struct session *s,
{
struct window *w;
struct environ env;
const char *shell;
u_int hlimit;
environ_init(&env);
@ -214,9 +216,13 @@ session_new(struct session *s,
environ_copy(&s->environ, &env);
server_fill_environ(s, &env);
shell = options_get_string(&s->options, "default-shell");
if (*shell == '\0' || areshell(shell))
shell = _PATH_BSHELL;
hlimit = options_get_number(&s->options, "history-limit");
w = window_create(
name, cmd, cwd, &env, &s->tio, s->sx, s->sy, hlimit, cause);
name, cmd, shell, cwd, &env, &s->tio, s->sx, s->sy, hlimit, cause);
if (w == NULL) {
environ_free(&env);
return (NULL);