switch back to kqueue for now, since (a) kqueue has been fixed to deal

with strange devices and (b) since there appears to be a bull in the
poll code in libevent as well...
requested by nicm who is away

diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index 4d52b88..daca238 100644 (file)
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.90 2010/07/24 19:25:32 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.91 2010/08/04 19:46:13 deraadt Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -139,11 +139,8 @@ server_start(char *path)
                fatal("daemon failed");
 
        /* event_init() was called in our parent, need to reinit. */
-       if (setenv("EVENT_NOKQUEUE", "1", 1) != 0)
-               fatal("setenv");
        if (event_reinit(ev_base) != 0)
                fatal("event_reinit failed");
-       unsetenv("EVENT_NOKQUEUE");
        clear_signals();
 
        logfile("server");

diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index d34b031..76107b3 100644 (file)
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.85 2010/07/24 19:25:31 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.86 2010/08/04 19:46:13 deraadt Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -532,10 +532,7 @@ main(int argc, char **argv)
                exit(1);
        }
 
-       if (setenv("EVENT_NOKQUEUE", "1", 1) != 0)
-               fatal("setenv");
        ev_base = event_init();
-       unsetenv("EVENT_NOKQUEUE");
        set_signals(main_signal);
 
        /* Initialise the client socket/start the server. */