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

Add default-command option and change default to be $SHELL rather than $SHELL -l. Also try to read shell from passwd db if $SHELL isn't present.

Browse Source
This commit is contained in:
Nicholas Marriott
2007-10-20 09:57:08 +00:00
parent 8d09be0cb1
commit f2f1b8fc81
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.34 2007-10-19 21:58:17 nicm Exp $ */
/* $Id: tmux.c,v 1.35 2007-10-20 09:57:08 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -23,6 +23,7 @@
#include <errno.h>
#include <paths.h>
#include <poll.h>
#include <pwd.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
@ -168,6 +169,7 @@ main(int argc, char **argv)
struct pollfd pfd;
struct hdr hdr;
const char *shell;
struct passwd *pw;
char *path, *cause, name[MAXNAMELEN];
int n, opt;
@ -203,9 +205,15 @@ main(int argc, char **argv)
bell_action = BELL_ANY;
shell = getenv("SHELL");
if (shell == NULL || *shell == '\0')
shell = "/bin/ksh";
xasprintf(&default_command, "exec %s -l", shell);
if (shell == NULL || *shell == '\0') {
pw = getpwuid(getuid());
if (pw != NULL)
shell = pw->pw_shell;
endpwent();
if (shell == NULL || *shell == '\0')
shell = _PATH_BSHELL;
}
xasprintf(&default_command, "exec %s", shell);
if ((cmd = cmd_parse(argc, argv, &cause)) == NULL) {
if (cause == NULL)