===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v
retrieving revision 1.42
retrieving revision 1.48
diff -u -p -r1.42 -r1.48
--- OpenXM/src/kan96xx/Kan/ext.c	2010/08/30 04:17:17	1.42
+++ OpenXM/src/kan96xx/Kan/ext.c	2016/03/31 05:27:34	1.48
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.41 2005/09/27 06:10:43 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.47 2016/03/31 03:22:54 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,6 +20,7 @@
 #include <errno.h>
 #include <regex.h>
 #include "ox_pathfinder.h"
+#include "mysig.h"
 
 extern int Quiet;
 extern char **environ;
@@ -31,7 +34,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 +45,7 @@ static void mywait() {
       if (Mycp > 0) Mycp--;
     }
   }
-  signal(SIGCHLD,mywait);
+  mysignal(SIGCHLD,mywait);
 }
 
 #define SIZE_OF_ENVSTACK 5
@@ -107,6 +110,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
@@ -140,10 +144,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 +181,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 +256,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) {
@@ -460,12 +468,18 @@ 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");