=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.41 retrieving revision 1.46 diff -u -p -r1.41 -r1.46 --- OpenXM/src/kan96xx/Kan/ext.c 2005/09/27 06:10:43 1.41 +++ OpenXM/src/kan96xx/Kan/ext.c 2013/09/25 00:05:55 1.46 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.40 2005/09/27 05:46:50 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.45 2013/09/22 01:32:10 takayama Exp $ */ #include #include #include @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include "datatype.h" #include "stackm.h" #include "extern.h" @@ -107,6 +109,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 @@ -177,6 +180,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)); @@ -387,6 +394,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,12 +467,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");