Changeset 5166

Timestamp:

Feb 28, 2008, 5:51:54 PM (14 years ago)

Author:

charles

Message:

(gtk) use signal, instead of sigaction, for portability

File:

• trunk/gtk/main.c (modified) (5 diffs)

trunk/gtk/main.c

@@ -67 +67 @@
 /* interval in milliseconds to check for stopped torrents and update display */
 #define EXIT_CHECK_INTERVAL     500
-
-/* number of fatal signals required to cause an immediate exit */
-#define SIGCOUNT_MAX            3
 
 #if GTK_CHECK_VERSION(2,8,0)
@@ -124 +121 @@
 static GtkUIManager * myUIManager = NULL;
 
-static sig_atomic_t global_sigcount = 0;
-
 static gboolean
 sendremote( GList * files, gboolean sendquit );
@@ -155 +150 @@
 static gboolean
 updatemodel(gpointer gdata);
-
-static void
-setupsighandlers(void);
-static void
-fatalsig(int sig);
 
 struct counts_data
@@ -233 +223 @@
         cbdata->minimized = ( event->new_window_state & GDK_WINDOW_STATE_ICONIFIED ) ? 1 : 0;
     }
+}
+
+static sig_atomic_t global_sigcount = 0;
+
+static void
+fatalsig( int sig )
+{
+    static const int SIGCOUNT_MAX = 3; /* revert to default handler after this many */
+
+    if( ++global_sigcount >= SIGCOUNT_MAX )
+    {
+        signal( sig, SIG_DFL );
+        raise( sig );
+    }
+}
+
+
+static void
+setupsighandlers( void )
+{
+#ifdef G_OS_WIN32
+  const int sigs[] = { SIGINT, SIGTERM };
+#else
+  const int sigs[] = { SIGHUP, SIGINT, SIGQUIT, SIGTERM };
+#endif
+  guint i;
+
+  for( i=0; i<G_N_ELEMENTS(sigs); ++i )
+      signal( sigs[i], fatalsig );
 }
 
@@ -1134 +1153 @@
         updatemodel( data );
 }
-
-
-static void
-setupsighandlers(void) {
-  int sigs[] = {SIGHUP, SIGINT, SIGQUIT, SIGTERM};
-  struct sigaction sa;
-  int ii;
-
-  memset(&sa, 0,  sizeof(sa));
-  sa.sa_handler = fatalsig;
-  for(ii = 0; ii < ALEN(sigs); ii++)
-    sigaction(sigs[ii], &sa, NULL);
-}
-
-static void
-fatalsig(int sig) {
-  struct sigaction sa;
-
-  if(SIGCOUNT_MAX <= ++global_sigcount) {
-    memset(&sa, 0,  sizeof(sa));
-    sa.sa_handler = SIG_DFL;
-    sigaction(sig, &sa, NULL);
-    raise(sig);
-  }
-}