circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Login shell can be a client flag, and move the exec code into client.c.

Browse Source
This commit is contained in:
nicm
2015-08-30 22:40:25 +00:00
parent dd92b6e83d
commit c6e9160c67
3 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tmux.c
View File

@ -46,7 +46,6 @@ char *shell_cmd;
int debug_level;
time_t start_time;
char socket_path[PATH_MAX];
int login_shell;
char *environ_path;
__dead void usage(void);
@ -170,32 +169,6 @@ setblocking(int fd, int state)
}
}
__dead void
shell_exec(const char *shell, const char *shellcmd)
{
const char *shellname, *ptr;
char *argv0;
ptr = strrchr(shell, '/');
if (ptr != NULL && *(ptr + 1) != '\0')
shellname = ptr + 1;
else
shellname = shell;
if (login_shell)
xasprintf(&argv0, "-%s", shellname);
else
xasprintf(&argv0, "%s", shellname);
setenv("SHELL", shell, 1);
setblocking(STDIN_FILENO, 1);
setblocking(STDOUT_FILENO, 1);
setblocking(STDERR_FILENO, 1);
closefrom(STDERR_FILENO + 1);
execl(shell, argv0, "-c", shellcmd, (char *) NULL);
fatal("execl failed");
}
const char *
find_home(void)
{
@ -229,9 +202,12 @@ main(int argc, char **argv)
setlocale(LC_TIME, "");
flags = 0;
if (**argv == '-')
flags = CLIENT_LOGIN;
else
flags = 0;
label = path = NULL;
login_shell = (**argv == '-');
while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) {
switch (opt) {
case '2':
@ -252,7 +228,7 @@ main(int argc, char **argv)
cfg_file = xstrdup(optarg);
break;
case 'l':
login_shell = 1;
flags |= CLIENT_LOGIN;
break;
case 'L':
free(label);