[Gnash-commit] /srv/bzr/gnash/rtmp r9772: don't reinitialize the signal handler for SIGINT.

[rob]

------------------------------------------------------------
revno: 9772
committer: address@hidden
branch nick: rtmp
timestamp: Sat 2008-11-22 10:06:12 -0700
message:
  don't reinitialize the signal handler for SIGINT.
modified:
  libnet/network.cpp

=== modified file 'libnet/network.cpp'
--- a/libnet/network.cpp        2008-11-22 16:31:39 +0000
+++ b/libnet/network.cpp        2008-11-22 17:06:12 +0000
@@ -81,6 +81,8 @@
 #endif
 
 static void cntrlc_handler(int sig);
+// this is set when we get a signal during a pselect() or ppoll()
+static int  sig_number = 0;
 
 Network::Network()
        :
@@ -283,16 +285,16 @@
        sigset_t emptyset, blockset;
        sigemptyset(&blockset);         /* Block SIGINT */
         sigaddset(&blockset, SIGINT);
-        sigaddset(&blockset, SIGPIPE);
-        sigprocmask(SIG_BLOCK, &blockset, NULL);
+//        sigaddset(&blockset, SIGPIPE);
+       sigprocmask(SIG_BLOCK, &blockset, NULL);
 
-       // Trap ^C (SIGINT) so we can kill all the threads
-       struct sigaction  act;
-       act.sa_handler = cntrlc_handler;
-       act.sa_flags = 0;
-       sigemptyset(&act.sa_mask);
-       sigaction (SIGINT, &act, NULL);
-       sigaction (SIGPIPE, &act, NULL);
+//     // Trap ^C (SIGINT) so we can kill all the threads
+//     struct sigaction  act;
+//     act.sa_handler = cntrlc_handler;
+//     act.sa_flags = 0;
+//     sigemptyset(&act.sa_mask);
+//     sigaction (SIGINT, &act, NULL);
+//     sigaction (SIGPIPE, &act, NULL);
 #else
        struct timeval tval;
 #endif
@@ -329,11 +331,11 @@
 
         if (FD_ISSET(0, &fdset)) {
            if (_debug) {
-               log_debug(_("There is data at the console for stdin"));
+               log_debug(_("There is a new network connection request."));
            }
             return 1;
         }
-
+       
         // If interupted by a system call, try again
         if (ret == -1 && errno == EINTR) {
             log_debug(_("The accept() socket for fd #%d was interupted by a 
system call"), fd);
@@ -349,6 +351,7 @@
                 log_debug(_("The accept() socket for fd #%d timed out waiting 
to write"), fd);
             }
         }
+       
     }
 
 #ifndef HAVE_WINSOCK_H
@@ -836,11 +839,11 @@
         sigprocmask(SIG_BLOCK, &blockset, NULL);
 
        // Trap ^C (SIGINT) so we can kill all the threads
-       struct sigaction  act;
-       act.sa_handler = cntrlc_handler;
-       act.sa_flags = 0;
-       sigemptyset(&act.sa_mask);
-       sigaction (SIGINT, &act, NULL);
+//     struct sigaction  act;
+//     act.sa_handler = cntrlc_handler;
+//     act.sa_flags = 0;
+//     sigemptyset(&act.sa_mask);
+//     sigaction (SIGINT, &act, NULL);
 #else
        struct timeval tval;
 #endif
@@ -966,11 +969,11 @@
         sigprocmask(SIG_BLOCK, &blockset, NULL);
 
        // Trap ^C (SIGINT) so we can kill all the threads
-       struct sigaction  act;
-       act.sa_handler = cntrlc_handler;
-       act.sa_flags = 0;
-       sigemptyset(&act.sa_mask);
-       sigaction (SIGINT, &act, NULL);
+//     struct sigaction  act;
+//     act.sa_handler = cntrlc_handler;
+//     act.sa_flags = 0;
+//     sigemptyset(&act.sa_mask);
+//     sigaction (SIGINT, &act, NULL);
 //     sigaction (SIGPIPE, &act, NULL);
 #else
        struct timeval tval;
@@ -1074,16 +1077,16 @@
        sigset_t emptyset, blockset;
        sigemptyset(&blockset);         /* Block SIGINT */
         sigaddset(&blockset, SIGINT);
-        sigaddset(&blockset, SIGPIPE);
+//        sigaddset(&blockset, SIGPIPE);
         sigprocmask(SIG_BLOCK, &blockset, NULL);
 
        // Trap ^C (SIGINT) so we can kill all the threads
-       struct sigaction  act;
-       act.sa_handler = cntrlc_handler;
-       act.sa_flags = 0;
-       sigemptyset(&act.sa_mask);
-       sigaction (SIGINT, &act, NULL);
-       sigaction (SIGPIPE, &act, NULL);
+//     struct sigaction  act;
+//     act.sa_handler = cntrlc_handler;
+//     act.sa_flags = 0;
+//     sigemptyset(&act.sa_mask);
+//     sigaction (SIGINT, &act, NULL);
+//     sigaction (SIGPIPE, &act, NULL);
        tval.tv_sec = _timeout;
        tval.tv_nsec = 0;
        int ret = ppoll(fds, limit, &tval, &emptyset);
@@ -1254,8 +1257,8 @@
 static void
 cntrlc_handler (int sig)
 {
+    sig_number = sig;
     log_debug(_("Got an %d interrupt while blocked on pselect()"), sig);
-
     exit(-1);
 }