===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v
retrieving revision 1.39
retrieving revision 1.50
diff -u -p -r1.39 -r1.50
--- OpenXM/src/kan96xx/Kan/ext.c	2005/07/18 10:55:16	1.39
+++ OpenXM/src/kan96xx/Kan/ext.c	2020/10/06 11:33:46	1.50
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.38 2005/07/03 11:08:53 ohara Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.49 2018/09/07 00:09:32 takayama Exp $ */
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -7,6 +7,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <sys/time.h>
+#include <time.h>
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
@@ -18,7 +20,10 @@
 #include <errno.h>
 #include <regex.h>
 #include "ox_pathfinder.h"
+#include "mysig.h"
 
+void cmoDumpCmo(struct object ob); /* defined in ../plugin/cmo0.h */
+
 extern int Quiet;
 extern char **environ;
 extern char *MsgSourceTrace;
@@ -31,7 +36,7 @@ static void mywait() {
   int status;
   int pid;
   int i,j;
-  /* signal(SIGCHLD,SIG_IGN); */
+  /* mysignal(SIGCHLD,SIG_IGN); */
   pid = wait(&status);
   if ((!Quiet) && (Verbose_mywait)) fprintf(stderr,"Child process %d is exiting.\n",pid);
   for (i=0; i<Mycp; i++) {
@@ -42,7 +47,7 @@ static void mywait() {
       if (Mycp > 0) Mycp--;
     }
   }
-  signal(SIGCHLD,mywait);
+  mysignal(SIGCHLD,mywait);
 }
 
 #define SIZE_OF_ENVSTACK 5
@@ -107,6 +112,7 @@ struct object Kextension(struct object obj)
   char *abc;
   char *abc2;
   extern struct context *CurrentContextp;
+  struct timeval tm;
 #if (__CYGWIN__)
   extern sigjmp_buf EnvOfStackMachine;
 #else
@@ -120,7 +126,7 @@ struct object Kextension(struct object obj)
   char **argv;
   FILE *fp;
   void (*oldsig)();
-  extern SecureMode;
+  extern int SecureMode;
   extern char *UD_str;
   extern int UD_attr;
 
@@ -140,10 +146,10 @@ struct object Kextension(struct object obj)
     pushEnv(EnvOfStackMachine);
     m = KSexecuteString(obj1.lc.str);
     /* This is critical area. If you catch ctrl-c here, program crashes. */
-    oldsig = signal(SIGINT,SIG_IGN);
+    oldsig = mysignal(SIGINT,SIG_IGN);
     popEnv(EnvOfStackMachine);
     /* OK! We passed the critical area. */
-    signal(SIGINT,oldsig);
+    mysignal(SIGINT,oldsig);
     rob = KpoInteger(m);
   }else if (strcmp(key,"getpid") == 0) {
     rob = KpoInteger( (int) getpid() );
@@ -177,6 +183,10 @@ struct object Kextension(struct object obj)
         else {
         system(KopString(getoa(obj,1))); exit(0);
         } */
+  }else if (strcmp(key,"date")==0) {
+    if (size != 1) errorKan1("%s\n","[(date)] extension.");
+    gettimeofday(&tm,NULL);
+    rob = KpoString(ctime((time_t *)&(tm.tv_sec)));
   }else if (strcmp(key,"defaultPolyRing")==0) {
     if (size != 2) errorKan1("%s\n","[(defaultPolyRing) n] extension.");
     rob = KdefaultPolyRing(getoa(obj,1));
@@ -248,7 +258,7 @@ struct object Kextension(struct object obj)
       if (m&2) {
          /* Do not call singal to turn around a trouble on cygwin. BUG. */
       }else{
-         signal(SIGCHLD,mywait); /* to kill Zombie */
+         mysignal(SIGCHLD,mywait); /* to kill Zombie */
       }
       Mychildren[Mycp++] = pid;
       if (Mycp >= MYCP_SIZE-1) {
@@ -387,6 +397,7 @@ struct object Kextension(struct object obj)
     if (obj1.tag != Sdollar) errorKan1("%s\n","[(getServerEnv) serverName] extension.");
     {
       char **se; int ii; int nn;
+	  char **getServerEnv(char *);
       se = getServerEnv(KopString(obj1));
       if (se == NULL) {
         debugServerEnv(KopString(obj1));
@@ -459,13 +470,29 @@ struct object Kextension(struct object obj)
 	obj2 = getoa(obj,2);
     rob = Kjoin(obj1,obj2);
   }else if (strcmp(key,"ostype")==0) {
-    rob = newObjectArray(1);
-    /* Hard encode the OS type. */
+    /* Hard encode the OS type.  cpp -dM /dev/null */
 #if defined(__CYGWIN__)
+    rob = newObjectArray(1);
     putoa(rob,0,KpoString("windows"));
 #else
+    rob = newObjectArray(2);
     putoa(rob,0,KpoString("unix"));
+#if defined(__APPLE__)
+    putoa(rob,1,KpoString("mac"));
+#else
+    putoa(rob,1,KpoString("generic"));
 #endif
+#endif
+  }else if (strcmp(key,"stringToArgv")==0) {
+    if (size != 2) errorKan1("%s\n","[(stringToArgv) a ] extension b");
+	obj1 = getoa(obj,1);
+	if (obj1.tag != Sdollar) errorKan1("%s\n","[(stringToArgv) a ] extension b,  a must be a string.");
+    rob = KstringToArgv(obj1);
+  }else if (strcmp(key,"stringToArgv2")==0) {
+    if (size != 3) errorKan1("%s\n","[(stringToArgv2) str separator] extension b");
+	obj1 = getoa(obj,1);
+	obj2 = getoa(obj,2);
+    rob = KstringToArgv2(obj1,obj2);
   }else if (strcmp(key,"traceClearStack")==0) {
     traceClearStack();
     rob = NullObject;
@@ -499,6 +526,11 @@ struct object Kextension(struct object obj)
     obj1 = getoa(obj,1);
     if (obj1.tag != Sdollar) errorKan1("%s\n","unlink, the first argument should be a string (filename).");
     rob = KpoInteger(oxDeleteFile(KopString(obj1)));
+  }else if (strcmp(key,"quiet")==0) {
+    obj1 = getoa(obj,1);
+    if (obj1.tag != Sinteger) errorKan1("%s\n","quiet, the first argument should be an integer.");
+    Quiet = KopInteger(obj1);
+    rob = obj1;
   }
 #include "plugin.hh"
 #include "Kclass/tree.hh"