aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-09-23 14:39:30 +0000
committerTiago Cunha <tcunha@gmx.com>2009-09-23 14:39:30 +0000
commitacedc2dcf2673cf199ba1ba08705dc8fd270c0c7 (patch)
treef51d5c52a93e0f6f2fba161d87e0cd0ac7230ea0 /tmux.h
parentc40d8cbda4c391008b4c46d211d6f3c09accd81a (diff)
downloadrtmux-acedc2dcf2673cf199ba1ba08705dc8fd270c0c7.tar.gz
rtmux-acedc2dcf2673cf199ba1ba08705dc8fd270c0c7.tar.bz2
rtmux-acedc2dcf2673cf199ba1ba08705dc8fd270c0c7.zip
Sync OpenBSD patchset 345:
Don't attempt to open() the tty path, rely on the client sending its stdin fd with imsg and fatal if it doesn't, then set the FD_CLOEXEC flag in tty_init instead of tty_open to prevent them leaking into child processes if any are created between the two calls. This bumps the protocol version, so the tmux server should be killed before upgrading.
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/tmux.h b/tmux.h
index e709a30b..50b306d4 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.450 2009-09-22 14:22:21 tcunha Exp $ */
+/* $Id: tmux.h,v 1.451 2009-09-23 14:39:30 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -21,7 +21,7 @@
#include "config.h"
-#define PROTOCOL_VERSION 1
+#define PROTOCOL_VERSION 2
#include <sys/param.h>
#include <sys/time.h>
@@ -326,8 +326,6 @@ struct msg_command_data {
};
struct msg_identify_data {
- char tty[TTY_NAME_MAX];
-
char cwd[MAXPATHLEN];
char term[TERMINAL_LENGTH];
@@ -1198,7 +1196,7 @@ void tty_putcode2(struct tty *, enum tty_code_code, int, int);
void tty_puts(struct tty *, const char *);
void tty_putc(struct tty *, u_char);
void tty_pututf8(struct tty *, const struct grid_utf8 *);
-void tty_init(struct tty *, int, char *, char *);
+void tty_init(struct tty *, int, char *);
void tty_start_tty(struct tty *);
void tty_stop_tty(struct tty *);
void tty_detect_utf8(struct tty *);