=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.10 retrieving revision 1.14 diff -u -p -r1.10 -r1.14 --- OpenXM/src/kan96xx/Kan/ext.c 2002/07/28 02:48:16 1.10 +++ OpenXM/src/kan96xx/Kan/ext.c 2003/07/14 12:49:52 1.14 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.9 2002/02/24 10:27:18 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.13 2002/11/10 07:00:05 takayama Exp $ */ #include #include #include @@ -14,6 +14,8 @@ #include "plugin.h" #include +extern char **environ; + #define MYCP_SIZE 100 static int Mychildren[MYCP_SIZE]; static int Mycp = 0; @@ -87,7 +89,7 @@ struct object Kextension(struct object obj) struct object keyo; struct object rob = NullObject; struct object obj1,obj2,obj3,obj4; - int m,i,pid; + int m,i,pid, uid; int argListc, fdListc; char *abc; char *abc2; @@ -164,7 +166,7 @@ struct object Kextension(struct object obj) abc = getenv(KopString(obj1)); #if defined(__CYGWIN__) if (abc == NULL) { - abc2 = (char *)sGC_malloc(sizeof(char)*(strlen(KopString(obj1)+2))); + abc2 = (char *)sGC_malloc(sizeof(char)*(strlen(KopString(obj1))+2)); strcpy(abc2,KopString(obj1)); for (i=0; i>>\n"); } - execv(argv[0],argv); + execve(argv[0],argv,environ); /* This place will never be reached unless execv fails. */ fprintf(stderr,"forkExec fails: "); for (i=0; ilc).ival,(obj2.rc.op->rc).ival, m,CurrentContextp->userDictionary); + }else if (strcmp(key,"regionMatches")==0) { + if (size != 3) errorKan1("%s\n","[(regionMatches) str strArray] extension."); + obj1 = getoa(obj,1); + if (obj1.tag != Sdollar) errorKan1("%s\n","[(regionMatches) str strArray] extension. str must be a string."); + obj2 = getoa(obj,2); + if (obj2.tag != Sarray) errorKan1("%s\n","[(regionMatches) str strArray] extension. strArray must be an array."); + rob = KregionMatches(obj1,obj2); }else if (strcmp(key,"ostype")==0) { rob = newObjectArray(1); /* Hard encode the OS type. */ @@ -315,5 +339,40 @@ struct object Kextension(struct object obj) return(rob); +} + +struct object KregionMatches(struct object sobj, struct object keyArray) +{ + struct object rob; + int n,i,j,m,keyn; + char *s,*key; + rob = newObjectArray(3); + getoa(rob,0) = KpoInteger(-1); + getoa(rob,1) = NullObject; + getoa(rob,2) = NullObject; + + if (sobj.tag != Sdollar) return rob; + if (keyArray.tag != Sarray) return rob; + n = getoaSize(keyArray); + for (i=0; i