From e4573de97b40a7aaebcdcd2a4b699b5f995fe506 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Fri, 2 Jul 2010 02:52:13 +0000 Subject: Sync OpenBSD patchset 731: Send all three of stdin, stdout, stderr from the client to the server, so that commands can directly make use of them. This means that load-buffer and save-buffer can have "-" as the file to read from stdin or write to stdout. This is a protocol version bump so the tmux server will need to be restarted after upgrade (or an older client used). --- tmux.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index 5b377ea4..e2c1c0aa 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.566 2010-07-02 02:49:19 tcunha Exp $ */ +/* $Id: tmux.h,v 1.567 2010-07-02 02:52:13 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -21,7 +21,7 @@ #include "config.h" -#define PROTOCOL_VERSION 5 +#define PROTOCOL_VERSION 6 #include #include @@ -67,7 +67,6 @@ extern char **environ; */ #define COMMAND_LENGTH 2048 /* packed argv size */ #define TERMINAL_LENGTH 128 /* length of TERM environment variable */ -#define PRINT_LENGTH 512 /* printed error/message size */ #define ENVIRON_LENGTH 1024 /* environment variable length */ /* @@ -372,7 +371,9 @@ enum msgtype { MSG_ENVIRON, MSG_UNLOCK, MSG_LOCK, - MSG_SHELL + MSG_SHELL, + MSG_STDERR, + MSG_STDOUT, }; /* @@ -380,10 +381,6 @@ enum msgtype { * * Don't forget to bump PROTOCOL_VERSION if any of these change! */ -struct msg_print_data { - char msg[PRINT_LENGTH]; -}; - struct msg_command_data { pid_t pid; /* pid from $TMUX or -1 */ u_int idx; /* index from $TMUX */ @@ -1079,6 +1076,10 @@ struct client { char *cwd; struct tty tty; + FILE *stdin_file; + FILE *stdout_file; + FILE *stderr_file; + struct event repeat_timer; struct timeval status_timer; -- cgit