circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-05 16:27:03 +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

10
server-msg.c
View File

@ -1,4 +1,4 @@
/* $Id: server-msg.c,v 1.79 2009-08-14 21:17:54 tcunha Exp $ */
/* $Id: server-msg.c,v 1.80 2009-08-14 21:23:20 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -27,7 +27,7 @@
#include "tmux.h"
void server_msg_command(struct client *, struct msg_command_data *);
void server_msg_identify(struct client *, struct msg_identify_data *);
void server_msg_identify(struct client *, struct msg_identify_data *, int);
void server_msg_resize(struct client *, struct msg_resize_data *);
void printflike2 server_msg_command_error(struct cmd_ctx *, const char *, ...);
@ -76,7 +76,7 @@ server_msg_dispatch(struct client *c)
fatalx("bad MSG_IDENTIFY size");
memcpy(&identifydata, imsg.data, sizeof identifydata);
server_msg_identify(c, &identifydata);
server_msg_identify(c, &identifydata, imsg.fd);
break;
case MSG_RESIZE:
if (datalen != sizeof resizedata)
@ -235,7 +235,7 @@ error:
}
void
server_msg_identify(struct client *c, struct msg_identify_data *data)
server_msg_identify(struct client *c, struct msg_identify_data *data, int fd)
{
c->tty.sx = data->sx;
c->tty.sy = data->sy;
@ -247,7 +247,7 @@ server_msg_identify(struct client *c, struct msg_identify_data *data)
data->tty[(sizeof data->tty) - 1] = '\0';
data->term[(sizeof data->term) - 1] = '\0';
tty_init(&c->tty, data->tty, data->term);
tty_init(&c->tty, fd, data->tty, data->term);
if (data->flags & IDENTIFY_UTF8)
c->tty.flags |= TTY_UTF8;
if (data->flags & IDENTIFY_256COLOURS)