diff options
author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-06-28 22:10:43 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-06-28 22:10:43 +0000 |
commit | e2546c0ed9de9f453c28d13893e7cab5f97e212b (patch) | |
tree | 05e2c0153fb03a1137f4c1df6e27e61e2c0c45cb /usr.bin/tmux/tmux.c | |
parent | d2110dd96b54c8e81d65079f4e4d10ceebf630c5 (diff) |
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 'usr.bin/tmux/tmux.c')
-rw-r--r-- | usr.bin/tmux/tmux.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index c72be02927b..9f80e5a0b7d 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.82 2010/06/27 02:56:59 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.83 2010/06/28 22:10:42 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -596,7 +596,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) @@ -616,17 +615,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"); |