===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/option.c,v
retrieving revision 1.12
retrieving revision 1.20
diff -u -p -r1.12 -r1.20
--- OpenXM/src/kan96xx/Kan/option.c	2003/08/20 01:39:17	1.12
+++ OpenXM/src/kan96xx/Kan/option.c	2016/03/31 05:27:34	1.20
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/option.c,v 1.11 2003/08/19 08:02:10 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/option.c,v 1.19 2016/03/31 03:22:54 takayama Exp $ */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -7,6 +7,7 @@
 #include "kclass.h"
 #include "lookup.h"
 #include <signal.h>
+#include "mysig.h"
 
 extern void ctrlC();
 
@@ -17,6 +18,7 @@ struct object KsystemVariable(ob)
   /* Don't forget to write the keys in usage.c */
   extern int PrintDollar;
   extern int Wrap;
+  extern int COutput;
   extern struct ring *CurrentRingp;
   extern int Verbose;
   extern int UseCriterion1;
@@ -55,9 +57,16 @@ struct object KsystemVariable(ob)
   extern int EcartAutomaticHomogenization;
   extern int TraceLift;
   extern int DoCancel;
+  extern int DebugContentReduction;
+  extern int QuoteMode;
+  extern int RestrictedMode, RestrictedMode_saved;
+  extern int UseDsmall;
 
   int n,i;
-  struct object ob1,ob2,ob3,ob4;
+  struct object ob1 = OINIT;
+  struct object ob2 = OINIT;
+  struct object ob3 = OINIT;
+  struct object ob4 = OINIT;
   struct object rob = NullObject;
   switch (getoaSize(ob)) {
   case 1:   /* get the value */
@@ -68,6 +77,8 @@ struct object KsystemVariable(ob)
         rob = KpoInteger(PrintDollar);
       }else if (strcmp(ob1.lc.str,"Wrap") == 0) {
         rob = KpoInteger(Wrap);
+      }else if (strcmp(ob1.lc.str,"COutput") == 0) {
+        rob = KpoInteger(COutput);
       }else if (strcmp(ob1.lc.str,"P") == 0) {
         rob = KpoInteger(CurrentRingp->p);
       }else if (strcmp(ob1.lc.str,"N") == 0) {
@@ -182,6 +193,8 @@ struct object KsystemVariable(ob)
         rob = KpoString(RightBracket);
       }else if (strcmp(ob1.lc.str,"SecureMode")==0) {
         rob = KpoInteger(SecureMode);
+      }else if (strcmp(ob1.lc.str,"RestrictedMode")==0) {
+        rob = KpoInteger(RestrictedMode);
       }else if (strcmp(ob1.lc.str,"Ecart")==0) {
         rob = KpoInteger(Ecart);
       }else if (strcmp(ob1.lc.str,"EcartAutomaticHomogenization")==0) {
@@ -190,6 +203,12 @@ struct object KsystemVariable(ob)
         rob = KpoInteger(TraceLift);
       }else if (strcmp(ob1.lc.str,"DoCancel")==0) {
         rob = KpoInteger(DoCancel);
+      }else if (strcmp(ob1.lc.str,"DebugContentReduction")==0) {
+        rob = KpoInteger(DebugContentReduction);
+      }else if (strcmp(ob1.lc.str,"QuoteMode")==0) {
+        rob = KpoInteger(QuoteMode);
+      }else if (strcmp(ob1.lc.str,"UseDsmall")==0) {
+        rob = KpoInteger(UseDsmall);
       }else{
         warningKan("KsystemVariable():Unknown key word.\n");
       }
@@ -214,6 +233,9 @@ struct object KsystemVariable(ob)
           P = ob2.lc.ival;  Q should be set here too. 
           CurrentRingp->p = P;
           rob = KpoInteger(P); */
+      }else if (strcmp(ob1.lc.str,"COutput") == 0) {
+        COutput = ob2.lc.ival;
+        rob = KpoInteger(COutput);
       }else if (strcmp(ob1.lc.str,"NN") == 0) {
         if (ob2.lc.ival <= CurrentRingp->n && ob2.lc.ival >= CurrentRingp->m) {
           CurrentRingp->nn = ob2.lc.ival;
@@ -262,8 +284,8 @@ struct object KsystemVariable(ob)
         rob = KpoInteger(Strict2);
       }else if (strcmp(ob1.lc.str,"SigIgn") == 0) {
         SigIgn = ob2.lc.ival;
-        if (SigIgn) signal(SIGINT,SIG_IGN);
-        else signal(SIGINT,ctrlC);
+        if (SigIgn) mysignal(SIGINT,SIG_IGN);
+        else mysignal(SIGINT,ctrlC);
         rob = KpoInteger(SigIgn);
       }else if (strcmp(ob1.lc.str,"KSPushEnvMode") == 0) {
         KSPushEnvMode = ob2.lc.ival;
@@ -308,6 +330,14 @@ struct object KsystemVariable(ob)
           errorKan1("%s\n","You cannot weaken the security level.");
         }
         rob = KpoInteger(SecureMode);
+      }else if (strcmp(ob1.lc.str,"RestrictedMode") == 0) {
+        if (KopInteger(ob2) >= RestrictedMode) {
+          RestrictedMode = KopInteger(ob2);
+          RestrictedMode_saved = RestrictedMode;
+        }else{
+          errorKan1("%s\n","You cannot weaken the RestrictedMode level.");
+        }
+        rob = KpoInteger(RestrictedMode);
       }else if (strcmp(ob1.lc.str,"Ecart") == 0) {
         Ecart = KopInteger(ob2);
         rob = KpoInteger(Ecart);
@@ -320,6 +350,15 @@ struct object KsystemVariable(ob)
       }else if (strcmp(ob1.lc.str,"DoCancel") == 0) {
         DoCancel = KopInteger(ob2);
         rob = KpoInteger(DoCancel);
+      }else if (strcmp(ob1.lc.str,"DebugContentReduction") == 0) {
+        DebugContentReduction = KopInteger(ob2);
+        rob = KpoInteger(DebugContentReduction);
+      }else if (strcmp(ob1.lc.str,"QuoteMode") == 0) {
+        QuoteMode = KopInteger(ob2);
+        rob = KpoInteger(QuoteMode);
+      }else if (strcmp(ob1.lc.str,"UseDsmall") == 0) {
+        UseDsmall = KopInteger(ob2);
+        rob = KpoInteger(UseDsmall);
       }else{
         warningKan("KsystemVariable():Unknown key word.\n");
       }