Changeset 7c96c03 in git for Singular/cntrlc.cc

Timestamp:

Apr 25, 2005, 3:25:46 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

3c7701bf86d90dc75b730f71518108d3a6a41f4b

Parents:

911a7a2aa353c94925a929b40ffab0ee13722bc4

Message:

*hannes: syntax fixed


git-svn-id: file:///usr/local/Singular/svn/trunk@7894 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.44 2005-04-24 08:43:16 krueger Exp $ */
+/* $Id: cntrlc.cc,v 1.45 2005-04-25 13:25:46 Singular Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -87 +87 @@
 typedef void (*si_hdl_typ)(int);
 
+
 /*0 implementation*/
 /*---------------------------------------------------------------------*
@@ -94 +95 @@
 #ifndef MSDOS
 /* signals are not implemented in DJGCC */
-# ifndef macintosh
-/* signals are not right implemented in macintosh */
 void sigint_handler(int sig);
-# endif /* !macintosh */
 #endif /* MSDOS */
 
-extern sighandler_t set_signal ( int sig, sighandler_t signal_handler);
+si_hdl_typ si_set_signal ( int sig, si_hdl_typ signal_handler);
 
 /*---------------------------------------------------------------------*/
@@ -112 +110 @@
 **/
 /*---------------------------------------------------------------------*/
-sighandler_t set_signal (
+si_hdl_typ si_set_signal (
   int sig,
-  sighandler_t signal_handler
+  si_hdl_typ signal_handler
   )
 {
-  sighandler_t retval;
-  if ((retval=signal (sig, (si_hdl_typ)signal_handler)) == SIG_ERR) {
+  si_hdl_typ retval=signal (sig, (si_hdl_typ)signal_handler);
+  if (retval == SIG_ERR)
+  {
      fprintf(stderr, "Unable to init signal %d ... exiting...\n", sig);
   }
   siginterrupt(sig, 1);
   return retval;
-}                               /* set_signal */
+}                               /* si_set_signal */
 
 
@@ -231 +230 @@
   mmPage_tab_acc++;
   mmPage_AllowAccess((void *)base);
-  set_signal(SIGSEGV,(si_hdl_typ)sig11_handler);
+  si_set_signal(SIGSEGV,(si_hdl_typ)sig11_handler);
 }
 
@@ -257 +256 @@
   o.it_value.tv_usec    =(unsigned)PAGE_INTERRUPT_TIME;
   setitimer(ITIMER_VIRTUAL,&t,&o);
-  set_signal(SIGVTALRM,(si_hdl_typ)sigalarm_handler);
+  si_set_signal(SIGVTALRM,(si_hdl_typ)sigalarm_handler);
 }
 # endif /* PAGE_TEST */
@@ -268 +267 @@
 /*4 signal handler: linux*/
 # ifdef PAGE_TEST
-  set_signal(SIGSEGV,(si_hdl_typ)sig11_handler);
+  si_set_signal(SIGSEGV,(si_hdl_typ)sig11_handler);
   struct itimerval t,o;
   memset(&t,0,sizeof(t));
@@ -276 +275 @@
   o.it_value.tv_usec    =(unsigned)PAGE_INTERRUPT_TIME;
   setitimer(ITIMER_VIRTUAL,&t,&o);
-  set_signal(SIGVTALRM,(si_hdl_typ)sigalarm_handler);
+  si_set_signal(SIGVTALRM,(si_hdl_typ)sigalarm_handler);
 # else /* PAGE_TEST */
-  if (SIG_ERR==set_signal(SIGSEGV,(si_hdl_typ)sigsegv_handler))
+  if (SIG_ERR==si_set_signal(SIGSEGV,(si_hdl_typ)sigsegv_handler))
   {
     PrintS("cannot set signal handler for SEGV\n");
   }
 # endif /* PAGE_TEST */
-  if (SIG_ERR==set_signal(SIGFPE, (si_hdl_typ)sigsegv_handler))
+  if (SIG_ERR==si_set_signal(SIGFPE, (si_hdl_typ)sigsegv_handler))
   {
     PrintS("cannot set signal handler for FPE\n");
   }
-  if (SIG_ERR==set_signal(SIGILL, (si_hdl_typ)sigsegv_handler))
+  if (SIG_ERR==si_set_signal(SIGILL, (si_hdl_typ)sigsegv_handler))
   {
     PrintS("cannot set signal handler for ILL\n");
   }
-  if (SIG_ERR==set_signal(SIGIOT, (si_hdl_typ)sigsegv_handler))
+  if (SIG_ERR==si_set_signal(SIGIOT, (si_hdl_typ)sigsegv_handler))
   {
     PrintS("cannot set signal handler for IOT\n");
   }
-  if (SIG_ERR==set_signal(SIGINT ,(si_hdl_typ)sigint_handler))
+  if (SIG_ERR==si_set_signal(SIGINT ,(si_hdl_typ)sigint_handler))
   {
     PrintS("cannot set signal handler for INT\n");
   }
-  //set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
-  set_signal(SIGCHLD, (si_hdl_typ)sig_ign_hdl);
+  //si_set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
+  si_set_signal(SIGCHLD, (si_hdl_typ)sig_ign_hdl);
 }
 
@@ -341 +340 @@
 {
 /*4 signal handler:*/
-  set_signal(SIGSEGV,sigsegv_handler);
-  set_signal(SIGBUS, sigsegv_handler);
-  set_signal(SIGFPE, sigsegv_handler);
-  set_signal(SIGILL, sigsegv_handler);
-  set_signal(SIGIOT, sigsegv_handler);
-  set_signal(SIGINT ,sigint_handler);
-  set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
+  si_set_signal(SIGSEGV,sigsegv_handler);
+  si_set_signal(SIGBUS, sigsegv_handler);
+  si_set_signal(SIGFPE, sigsegv_handler);
+  si_set_signal(SIGILL, sigsegv_handler);
+  si_set_signal(SIGIOT, sigsegv_handler);
+  si_set_signal(SIGINT ,sigint_handler);
+  si_set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
 }
 # else /* SPARC_SUNOS_4 */
@@ -355 +354 @@
 * signal handler for run time errors, general version
 */
-#  ifndef macintosh
 void sigsegv_handler(int sig)
 {
@@ -387 +385 @@
   exit(0);
 }
-#  endif /* !macintosh */
 
 /*2
@@ -396 +393 @@
 #  ifndef MSDOS
 /* signals are not implemented in DJGCC */
-#   ifndef macintosh
-/* signals are temporaliy removed for macs. */
 /*4 signal handler:*/
-  set_signal(SIGSEGV,(void (*) (int))sigsegv_handler);
+  si_set_signal(SIGSEGV,(void (*) (int))sigsegv_handler);
 #    ifdef SIGBUS
-  set_signal(SIGBUS, sigsegv_handler);
+  si_set_signal(SIGBUS, sigsegv_handler);
 #    endif /* SIGBUS */
 #    ifdef SIGFPE
-  set_signal(SIGFPE, sigsegv_handler);
+  si_set_signal(SIGFPE, sigsegv_handler);
 #    endif /* SIGFPE */
 #    ifdef SIGILL
-  set_signal(SIGILL, sigsegv_handler);
+  si_set_signal(SIGILL, sigsegv_handler);
 #    endif /* SIGILL */
 #    ifdef SIGIOT
-  set_signal(SIGIOT, sigsegv_handler);
+  si_set_signal(SIGIOT, sigsegv_handler);
 #    endif /* SIGIOT */
 #    ifdef SIGXCPU
-  set_signal(SIGXCPU, (void (*)(int))SIG_IGN);
+  si_set_signal(SIGXCPU, (void (*)(int))SIG_IGN);
 #    endif /* SIGIOT */
-  set_signal(SIGINT ,sigint_handler);
-  set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
-#   endif /* !macintosh */
+  si_set_signal(SIGINT ,sigint_handler);
+  si_set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
 #  endif /* !MSDOS */
 }
@@ -425 +419 @@
 
 #ifndef MSDOS
-# ifndef macintosh
 /*2
 * signal handler for SIGINT
@@ -486 +479 @@
       case 'c':
                 if (feGetOptValue(FE_OPT_EMACS) == NULL) fgetc(stdin);
-                set_signal(SIGINT ,(si_hdl_typ)sigint_handler);
+                si_set_signal(SIGINT ,(si_hdl_typ)sigint_handler);
                 return;
                 //siCntrlc ++;
-                //if (siCntrlc>2) set_signal(SIGINT,(si_hdl_typ) sigsegv_handler);
-                //else            set_signal(SIGINT,(si_hdl_typ) sigint_handler);
+                //if (siCntrlc>2) si_set_signal(SIGINT,(si_hdl_typ) sigsegv_handler);
+                //else            si_set_signal(SIGINT,(si_hdl_typ) sigint_handler);
     }
     cnt++;
@@ -496 +489 @@
   }
 }
-# endif /* !macintosh */
 #endif /* !MSDOS */
 
@@ -538 +530 @@
 //    int saveecho = si_echo;
 //    siCntrlc = FALSE;
-//    set_signal(SIGINT ,sigint_handler);
+//    si_set_signal(SIGINT ,sigint_handler);
 ////#ifdef macintosh
 ////    flush_intr();
@@ -735 +727 @@
   {
     int ret;
-    set_signal(SIGCHLD, (void (*)(int))SIG_DFL);
+    si_set_signal(SIGCHLD, (void (*)(int))SIG_DFL);
     ret = system(call);
-    set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
+    si_set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
     return ret;
   }