=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.35 retrieving revision 1.48 diff -u -p -r1.35 -r1.48 --- OpenXM/src/kan96xx/Kan/ext.c 2005/06/09 05:46:57 1.35 +++ OpenXM/src/kan96xx/Kan/ext.c 2016/03/31 05:27:34 1.48 @@ -1,11 +1,14 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.34 2004/12/21 03:25:04 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.47 2016/03/31 03:22:54 takayama Exp $ */ #include +#include #include #include #include #include #include #include +#include +#include #include "datatype.h" #include "stackm.h" #include "extern.h" @@ -17,9 +20,11 @@ #include #include #include "ox_pathfinder.h" +#include "mysig.h" extern int Quiet; extern char **environ; +extern char *MsgSourceTrace; #define MYCP_SIZE 100 static int Mychildren[MYCP_SIZE]; @@ -29,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 0) Mycp--; } } - signal(SIGCHLD,mywait); + mysignal(SIGCHLD,mywait); } #define SIZE_OF_ENVSTACK 5 @@ -94,14 +99,18 @@ struct object Kextension(struct object obj) { char *key; int size; - struct object keyo; + struct object keyo = OINIT; struct object rob = NullObject; - struct object obj1,obj2,obj3,obj4; + struct object obj1 = OINIT; + struct object obj2 = OINIT; + struct object obj3 = OINIT; + struct object obj4 = OINIT; int m,i,pid, uid; int argListc, fdListc; char *abc; char *abc2; extern struct context *CurrentContextp; + struct timeval tm; #if (__CYGWIN__) extern sigjmp_buf EnvOfStackMachine; #else @@ -135,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() ); @@ -172,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)); @@ -243,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) { @@ -315,15 +328,15 @@ struct object Kextension(struct object obj) }else if (strcmp(key,"getAttributeList")==0) { if (size != 2) errorKan1("%s\n","[(getAttributeList) ob] extension rob"); rob = KgetAttributeList(getoa(obj,1)); - }else if (strcmp(key,"putAttributeList")==0) { - if (size != 3) errorKan1("%s\n","[(putAttributeList) ob attrlist] extension rob"); - rob = KputAttributeList(getoa(obj,1), getoa(obj,2)); + }else if (strcmp(key,"setAttributeList")==0) { + if (size != 3) errorKan1("%s\n","[(setAttributeList) ob attrlist] extension rob"); + rob = KsetAttributeList(getoa(obj,1), getoa(obj,2)); }else if (strcmp(key,"getAttribute")==0) { if (size != 3) errorKan1("%s\n","[(getAttribute) ob key] extension rob"); rob = KgetAttribute(getoa(obj,1),getoa(obj,2)); - }else if (strcmp(key,"putAttribute")==0) { - if (size != 4) errorKan1("%s\n","[(putAttributeList) ob key value] extension rob"); - rob = KputAttribute(getoa(obj,1), getoa(obj,2),getoa(obj,3)); + }else if (strcmp(key,"setAttribute")==0) { + if (size != 4) errorKan1("%s\n","[(setAttributeList) ob key value] extension rob"); + rob = KsetAttribute(getoa(obj,1), getoa(obj,2),getoa(obj,3)); }else if (strcmp(key,"hilbert")==0) { if (size != 3) errorKan1("%s\n","[(hilbert) obgb obvlist] extension."); rob = hilberto(getoa(obj,1),getoa(obj,2)); @@ -382,6 +395,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)); @@ -454,13 +468,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; @@ -472,6 +502,14 @@ struct object Kextension(struct object obj) }else{ rob = NullObject; } + }else if (strcmp(key,"traceShowScannerBuf")==0) { + char *ssst; + ssst = MsgSourceTrace; + if (ssst != NULL) { + rob = KpoString(ssst); + }else{ + rob = NullObject; + } }else if (strcmp(key,"regexec")==0) { if ((size != 3) && (size != 4)) errorKan1("%s\n","[(regexec) reg strArray flag(optional)] extension b"); obj1 = getoa(obj,1); @@ -500,7 +538,7 @@ struct object Kextension(struct object obj) struct object KregionMatches(struct object sobj, struct object keyArray) { - struct object rob; + struct object rob = OINIT; int n,i,j,m,keyn; char *s,*key; rob = newObjectArray(3); @@ -534,8 +572,8 @@ struct object KregionMatches(struct object sobj, struc } static struct object oregexec(struct object oregex,struct object ostrArray,struct object oflag) { - struct object rob; - struct object ob; + struct object rob = OINIT; + struct object ob = OINIT; int n,i,j,m,keyn,cflag,eflag,er; char *regex; regex_t preg;