aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-07-02 02:52:13 +0000
committerTiago Cunha <tcunha@gmx.com>2010-07-02 02:52:13 +0000
commite4573de97b40a7aaebcdcd2a4b699b5f995fe506 (patch)
tree1aea2b2ab724c59657ca3b87d5b47dfbc400dd3b /tmux.c
parent63e76b555d8f3d40f9905fb65a58f6e7509d399d (diff)
downloadrtmux-e4573de97b40a7aaebcdcd2a4b699b5f995fe506.tar.gz
rtmux-e4573de97b40a7aaebcdcd2a4b699b5f995fe506.tar.bz2
rtmux-e4573de97b40a7aaebcdcd2a4b699b5f995fe506.zip
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).
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/tmux.c b/tmux.c
index d10ca0e0..571ef070 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.212 2010-07-02 02:49:19 tcunha Exp $ */
+/* $Id: tmux.c,v 1.213 2010-07-02 02:52:13 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -613,7 +613,6 @@ main_dispatch(const char *shellcmd)
{
struct imsg imsg;
ssize_t n, datalen;
- struct msg_print_data printdata;
struct msg_shell_data shelldata;
if ((n = imsg_read(main_ibuf)) == -1 || n == 0)
@@ -633,17 +632,6 @@ main_dispatch(const char *shellcmd)
fatalx("bad MSG_EXIT size");
exit(main_exitval);
- case MSG_ERROR:
- case MSG_PRINT:
- if (datalen != sizeof printdata)
- fatalx("bad MSG_PRINT size");
- memcpy(&printdata, imsg.data, sizeof printdata);
- printdata.msg[(sizeof printdata.msg) - 1] = '\0';
-
- log_info("%s", printdata.msg);
- if (imsg.hdr.type == MSG_ERROR)
- main_exitval = 1;
- break;
case MSG_READY:
if (datalen != 0)
fatalx("bad MSG_READY size");