circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 246:

Browse Source 
Have the client pass its stdin fd to the server when identifying itself and
have the server use that rather than reopening the tty. If the fd isn't given,
use the old behaviour (so no need for a version change).

This allows tmux to be used as the shell, so also change so that when working
out the command to execute if default-command is empty (the default), tmux will
try not execute itself.
This commit is contained in:
Tiago Cunha
2009-08-14 21:23:20 +00:00
parent 0714e41148
commit e2a18894b3
5 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.124 2009-08-14 21:20:01 tcunha Exp $ */
/* $Id: tty.c,v 1.125 2009-08-14 21:23:20 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -45,9 +45,11 @@ void tty_cell(struct tty *,
const struct grid_cell *, const struct grid_utf8 *);
void
tty_init(struct tty *tty, char *path, char *term)
tty_init(struct tty *tty, int fd, char *path, char *term)
{
tty->path = xstrdup(path);
tty->fd = fd;
if (term == NULL || *term == '\0')
tty->termname = xstrdup("unknown");
else
@ -59,12 +61,14 @@ tty_init(struct tty *tty, char *path, char *term)
int
tty_open(struct tty *tty, const char *overrides, char **cause)
{
int mode;
int mode;
tty->fd = open(tty->path, O_RDWR|O_NONBLOCK);
if (tty->fd == -1) {
xasprintf(cause, "%s: %s", tty->path, strerror(errno));
return (-1);
tty->fd = open(tty->path, O_RDWR|O_NONBLOCK);
if (tty->fd == -1) {
xasprintf(cause, "%s: %s", tty->path, strerror(errno));
return (-1);
}
}
if ((mode = fcntl(tty->fd, F_GETFL)) == -1)