Changeset e8a30d in git

Timestamp:

Jun 9, 1997, 2:18:15 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

Children:

c3c41315340ade2e74c099735037a3ee115555be

Parents:

5756804ac5037bf827b8e5d382c302898cafb2f0

Message:

* hannes: removed test_int, changed "abort" in ^c handling
          (cntrlc.*)


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

Location:

Singular

Files:

• cntrlc.cc (modified) (5 diffs)
• cntrlc.h (modified) (2 diffs)

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.11 1997-05-02 15:07:25 Singular Exp $ */
+/* $Id: cntrlc.cc,v 1.12 1997-06-09 12:17:48 Singular Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -56 +56 @@
 
 /* data */
-static BOOLEAN siCntrlc = FALSE;
+BOOLEAN siCntrlc = FALSE;
 int siRandomStart;
 
@@ -307 +307 @@
   loop
   {
+    int cnt=0;
     fputs("\nabort(a), continue(c) or quit(q) ?",stderr);fflush(stderr);
     switch(fgetc(stdin))
@@ -312 +313 @@
       case 'q':
                 m2_end(2);
+      case 'a':
+                siCntrlc++;
       case 'c':
                 fgetc(stdin);
                 signal(SIGINT ,(s_hdl_typ)sigint_handler);
                 return;          
-      case 'a':
-                m2_end(2);
                 //siCntrlc ++;
                 //if (siCntrlc>2) signal(SIGINT,(s_hdl_typ) sigsegv_handler);
                 //else            signal(SIGINT,(s_hdl_typ) sigint_handler);
     }
+    cnt++;
+    if(cnt>5) m2_end(2);
   }
 }
@@ -386 +389 @@
 
 #ifndef MSDOS
-void test_int()
-{
-#ifndef macintosh
-  if (siCntrlc!=0)
-  {
-    int saveecho = si_echo;
-    siCntrlc = FALSE;
-    signal(SIGINT ,sigint_handler);
-//#ifdef macintosh
-//    flush_intr();
+//void test_int()
+//{
+//#ifndef macintosh
+//  if (siCntrlc!=0)
+//  {
+//    int saveecho = si_echo;
+//    siCntrlc = FALSE;
+//    signal(SIGINT ,sigint_handler);
+////#ifdef macintosh
+////    flush_intr();
+////#endif
+//    iiDebug();
+//    si_echo = saveecho;
+//  }
 //#endif
-    iiDebug();
-    si_echo = saveecho;
-  }
-#endif
-}
+//}
 #endif
 

Singular/cntrlc.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.h,v 1.4 1997-04-25 15:03:55 obachman Exp $ */
+/* $Id: cntrlc.h,v 1.5 1997-06-09 12:17:49 Singular Exp $ */
 /*
 * ABSTRACT - interupt and signal handling
@@ -11 +11 @@
 
 extern int siRandomStart;
+extern BOOLEAN siCntrlc;
 void init_signals();
-#ifndef MSDOS
-#define test_int_std(A) test_int()
-void test_int();
-#else
-#define test_int()
-#define test_int_std(A)
-#endif
 
 #endif