Changeset 72de5f in git

Timestamp:

Feb 4, 2013, 4:45:59 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

9bc6a43bf738fd99b4fb51230cb0c76f2ffee68d

Parents:

b7e0a075c343b4225cf6b4a64667feb0927313e2

Message:

chg: sigaction instead of signachg: sigaction instead of signal

from master

File:

• Singular/cntrlc.cc (modified) (2 diffs)

Singular/cntrlc.cc

@@ -132 +132 @@
 si_hdl_typ si_set_signal ( int sig, si_hdl_typ signal_handler)
 {
+#if 0
   si_hdl_typ retval=signal (sig, (si_hdl_typ)signal_handler);
   if (retval == SIG_ERR)
@@ -138 +139 @@
   }
 #ifdef HAVE_SIGINTERRUPT
-  siginterrupt(sig, 1);
+  siginterrupt(sig, 0);
+  /*system calls will be restarted if interrupted by  the  specified
+   * signal sig.  This is the default behavior in Linux.
+   */
+#endif
+#else
+  struct sigaction new_action,old_action;
+
+  /* Set up the structure to specify the new action. */
+  new_action.sa_handler = signal_handler;
+  if (sig==SIGINT)
+    sigemptyset (&new_action.sa_mask);
+  else
+    new_action.sa_flags = SA_RESTART;
+
+  int r=sigaction (sig, &new_action, &old_action);
+  si_hdl_typ retval=(si_hdl_typ)old_action.sa_handler;
+  if (r == -1)
+  {
+     fprintf(stderr, "Unable to init signal %d ... exiting...\n", sig);
+     retval=SIG_ERR;
+  }
 #endif
   return retval;