Sorry for the delay, this is applied now, thanks.
On Sat, May 15, 2010 at 12:03:03AM +0200, Romain Francoise wrote:
> I see that my patch is now in CVS, thanks! But the merge from
> OpenBSD back to SF was a bit careless, the setenv/unsetenv
> configuration for libevent is now a no-op since event_init() was
> moved elsewhere... please apply the following to SF to restore it:
>
> Index: server.c
> ===================================================================
> RCS file: /cvsroot/tmux/tmux/server.c,v
> retrieving revision 1.240
> diff -u -p -p -r1.240 server.c
> --- server.c 14 May 2010 14:30:01 -0000 1.240
> +++ server.c 14 May 2010 21:53:31 -0000
> @@ -168,21 +168,6 @@ server_start(char *path)
> setproctitle("server (%s)", rpathbuf);
> #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_client_create(pair[1]);
>
> Index: tmux.c
> ===================================================================
> RCS file: /cvsroot/tmux/tmux/tmux.c,v
> retrieving revision 1.207
> diff -u -p -p -r1.207 tmux.c
> --- tmux.c 14 May 2010 14:30:01 -0000 1.207
> +++ tmux.c 14 May 2010 21:53:31 -0000
> @@ -540,14 +540,6 @@ main(int argc, char **argv)
> 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
> if (setenv("EVENT_NOKQUEUE", "1", 1) != 0)
> fatal("setenv failed");
> @@ -556,12 +548,19 @@ main(int argc, char **argv)
> if (setenv("EVENT_NOPOLL", "1", 1) != 0)
> fatal("setenv failed");
> #endif
> + ev_base = event_init();
> #ifdef HAVE_BROKEN_KQUEUE
> unsetenv("EVENT_NOKQUEUE");
> #endif
> #ifdef HAVE_BROKEN_POLL
> unsetenv("EVENT_NOPOLL");
> #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);
>
------------------------------------------------------------------------------
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
