Changeset 32cb7a in git

Timestamp:

Oct 12, 2012, 5:18:39 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

17874ed75ee295b8f839c9c6087da10a82e6ff2e

Parents:

b51d2ccd49597e776969d2543051d6119c88d59b

Message:

chg: handling of cntrl-c (from master: --cntrlc=?)

Location:

Singular

Files:

• cntrlc.cc (modified) (5 diffs)
• feOptTab.h (modified) (1 diff)

Singular/cntrlc.cc

@@ -373 +373 @@
 #endif
 
-
 /*2
 * signal handler for SIGINT
 */
+int sigint_handler_cnt=0;
 void sigint_handler(int sig)
 {
@@ -383 +383 @@
   if (fe_is_raw_tty) fe_temp_reset();
   #endif /* HAVE_FEREAD */
+  char default_opt=' ';
+  if ((feOptSpec[FE_OPT_CNTRLC].value!=NULL)
+      && ((char*)(feOptSpec[FE_OPT_CNTRLC].value))[0])
+  { default_opt=((char*)(feOptSpec[FE_OPT_CNTRLC].value))[0]; }
   loop
   {
     int cnt=0;
     int c;
-    if(singular_in_batchmode)
+
+    if (singular_in_batchmode)
     {
       c = 'q';
+    }
+    else if (default_opt!=' ')
+    {
+      c = default_opt;
     }
     else
@@ -397 +406 @@
       if (feGetOptValue(FE_OPT_EMACS) == NULL)
       {
-        fputs("abort command(a), continue(c) or quit Singular(q) ?",stderr);fflush(stderr);
+        fputs("abort after this command(a), abort immediately(r), print backtrace(b), continue(c) or quit Singular(q) ?",stderr);fflush(stderr);
         c = fgetc(stdin);
       }
@@ -408 +417 @@
     switch(c)
     {
-      case 'q':
+      case 'q': case EOF:
                 m2_end(2);
       case 'r':
-                longjmp(si_start_jmpbuf,1);
+                if (sigint_handler_cnt<3)
+                {
+                  sigint_handler_cnt++;
+                  fputs("** Warning: Singular should be restarted as soon as possible **\n",stderr);
+                  fflush(stderr);
+                  longjmp(si_start_jmpbuf,1);
+                }
+                else
+                {
+                  fputs("** tried too often, try another possibility **\n",stderr);
+                  fflush(stderr);
+                }
+                break;
       case 'b':
                 VoiceBackTrack();
@@ -418 +439 @@
                 siCntrlc++;
       case 'c':
-                if (feGetOptValue(FE_OPT_EMACS) == NULL) fgetc(stdin);
+                if ((feGetOptValue(FE_OPT_EMACS) == NULL) && (default_opt!=' '))
+                {
+                  /* Read until a newline or EOF */
+                  while (c != EOF && c != '\n') c = fgetc(stdin);
+                }
                 si_set_signal(SIGINT ,(si_hdl_typ)sigint_handler);
                 return;

Singular/feOptTab.h

@@ -111 +111 @@
    "BROWSER",  "Display help in BROWSER (see help.cnf)",       feOptString, 0,   0},
 
+  {"cntrlc",           optional_argument,   LONG_OPTION_RETURN,
+   "CHAR",     "Automatic answer for CTRL-C prompt",                   feOptString, 0,   0},
 #ifndef ESINGULAR
   {"emacs",             no_argument,        LONG_OPTION_RETURN,