--- rxvt-unicode/src/rxvtd.C 2007/11/11 04:08:00 1.34 +++ rxvt-unicode/src/rxvtd.C 2007/12/04 14:50:43 1.40 @@ -48,11 +48,13 @@ int getfd (int remote_fd); server (int fd) - : read_ev (this, &server::read_cb), - log_cb (this, &server::log_msg), - getfd_cb (this, &server::getfd) + : read_ev (this, &server::read_cb) { + callback_set (log_cb , this, server, log_msg); + callback_set (getfd_cb, this, server, getfd); this->fd = fd; + fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, 0); read_ev.start (fd, ev::READ); } @@ -85,6 +87,7 @@ } fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, O_NONBLOCK); sa.sun_family = AF_UNIX; strcpy (sa.sun_path, sockname); @@ -115,10 +118,7 @@ int fd2 = accept (fd, 0, 0); if (fd2 >= 0) - { - fcntl (fd2, F_SETFD, FD_CLOEXEC); - new server (fd2); - } + new server (fd2); } int server::getfd (int remote_fd) @@ -273,9 +273,11 @@ } else if (pid > 0) _exit (EXIT_SUCCESS); + + ev_default_fork (); } - ev::ev_loop (0); + ev_loop (0); return EXIT_SUCCESS; }