extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-01-12 00:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge, from Romain Francoise.

Browse Source
This commit is contained in:
Nicholas Marriott 2010-05-16 17:50:31 +00:00
parent 41afc38dcc
commit 59c13133de
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.240 2010-05-14 14:30:01 tcunha Exp $ */ /* $Id: server.c,v 1.241 2010-05-16 17:50:31 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -168,21 +168,6 @@ server_start(char *path)
setproctitle("server (%s)", rpathbuf); setproctitle("server (%s)", rpathbuf);
#endif #endif
#ifdef HAVE_BROKEN_KQUEUE
if (setenv("EVENT_NOKQUEUE", "1", 1) != 0)
fatal("setenv failed");
#endif
#ifdef HAVE_BROKEN_POLL
if (setenv("EVENT_NOPOLL", "1", 1) != 0)
fatal("setenv failed");
#endif
#ifdef HAVE_BROKEN_KQUEUE
unsetenv("EVENT_NOKQUEUE");
#endif
#ifdef HAVE_BROKEN_POLL
unsetenv("EVENT_NOPOLL");
#endif
server_fd = server_create_socket(); server_fd = server_create_socket();
server_client_create(pair[1]); server_client_create(pair[1]);

17
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.207 2010-05-14 14:30:01 tcunha Exp $ */ /* $Id: tmux.c,v 1.208 2010-05-16 17:50:31 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -540,14 +540,6 @@ main(int argc, char **argv)
exit(1); exit(1);
} }
ev_base = event_init();
set_signals(main_signal);
/* Initialise the client socket/start the server. */
if ((main_ibuf = client_init(path, cmdflags, flags)) == NULL)
exit(1);
xfree(path);
#ifdef HAVE_BROKEN_KQUEUE #ifdef HAVE_BROKEN_KQUEUE
if (setenv("EVENT_NOKQUEUE", "1", 1) != 0) if (setenv("EVENT_NOKQUEUE", "1", 1) != 0)
fatal("setenv failed"); fatal("setenv failed");
@ -556,12 +548,19 @@ main(int argc, char **argv)
if (setenv("EVENT_NOPOLL", "1", 1) != 0) if (setenv("EVENT_NOPOLL", "1", 1) != 0)
fatal("setenv failed"); fatal("setenv failed");
#endif #endif
ev_base = event_init();
#ifdef HAVE_BROKEN_KQUEUE #ifdef HAVE_BROKEN_KQUEUE
unsetenv("EVENT_NOKQUEUE"); unsetenv("EVENT_NOKQUEUE");
#endif #endif
#ifdef HAVE_BROKEN_POLL #ifdef HAVE_BROKEN_POLL
unsetenv("EVENT_NOPOLL"); unsetenv("EVENT_NOPOLL");
#endif #endif
set_signals(main_signal);
/* Initialise the client socket/start the server. */
if ((main_ibuf = client_init(path, cmdflags, flags)) == NULL)
exit(1);
xfree(path);
imsg_compose(main_ibuf, msg, PROTOCOL_VERSION, -1, -1, buf, len); imsg_compose(main_ibuf, msg, PROTOCOL_VERSION, -1, -1, buf, len);