Changes in unix.c [c467adc:5535a47]

File:

• unix.c (modified) (5 diffs)

unix.c

@@ -48 +48 @@
 global_t global;        /* Against global namespace pollution */
 
-static struct {
-        int fd[2];
-        int tag;
-} shutdown_pipe = {{-1 , -1}, 0};
-
+static int signal_shutdown_pipe[2] = { -1, -1 };
 static void sighandler_shutdown(int signal);
 static void sighandler_crash(int signal);
@@ -160 +156 @@
         sigaction(SIGSEGV, &sig, &old);
 
-        sighandler_shutdown_setup();
-
-        sig.sa_handler = sighandler_shutdown;
-        sigaction(SIGINT, &sig, &old);
-        sigaction(SIGTERM, &sig, &old);
+        /* Use a pipe for SIGTERM/SIGINT so the actual signal handler doesn't do anything unsafe */
+        if (pipe(signal_shutdown_pipe) == 0) {
+                b_input_add(signal_shutdown_pipe[0], B_EV_IO_READ, bitlbee_shutdown, NULL);
+                sig.sa_handler = sighandler_shutdown;
+                sigaction(SIGINT, &sig, &old);
+                sigaction(SIGTERM, &sig, &old);
+        }
 
         if (!getuid() || !geteuid()) {
@@ -258 +256 @@
 }
 
-/* Set up a pipe for SIGTERM/SIGINT so the actual signal handler doesn't do anything unsafe */
-void sighandler_shutdown_setup()
-{
-        if (shutdown_pipe.fd[0] != -1) {
-                /* called again from a forked process, clean up to avoid propagating the signal */
-                b_event_remove(shutdown_pipe.tag);
-                close(shutdown_pipe.fd[0]);
-                close(shutdown_pipe.fd[1]);
-        }
-
-        if (pipe(shutdown_pipe.fd) == 0) {
-                shutdown_pipe.tag = b_input_add(shutdown_pipe.fd[0], B_EV_IO_READ, bitlbee_shutdown, NULL);
-        }
-}
-
 /* Signal handler for SIGTERM and SIGINT */
 static void sighandler_shutdown(int signal)
@@ -278 +261 @@
         /* Write a single null byte to the pipe, just to send a message to the main loop.
          * This gets handled by bitlbee_shutdown (the b_input_add callback for this pipe) */
-        write(shutdown_pipe.fd[1], "", 1);
+        write(signal_shutdown_pipe[1], "", 1);
 }
 
@@ -292 +275 @@
         for (l = irc_connection_list; l; l = l->next) {
                 irc_t *irc = l->data;
-                sock_make_blocking(irc->fd);
                 write(irc->fd, message, len);
         }