=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.10 retrieving revision 1.17 diff -u -p -r1.10 -r1.17 --- OpenXM/src/kan96xx/Kan/ext.c 2002/07/28 02:48:16 1.10 +++ OpenXM/src/kan96xx/Kan/ext.c 2003/11/24 02:13:40 1.17 @@ -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.16 2003/08/26 12:46:05 takayama Exp $ */ #include #include #include @@ -12,8 +12,12 @@ #include "extern2.h" #include #include "plugin.h" +#include "kclass.h" #include +#include "ox_pathfinder.h" +extern char **environ; + #define MYCP_SIZE 100 static int Mychildren[MYCP_SIZE]; static int Mycp = 0; @@ -87,7 +91,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 +168,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,"getServerEnv")==0) { + if (size != 2) errorKan1("%s\n","[(getServerEnv) serverName] extension."); + obj1 = getoa(obj,1); + if (obj1.tag != Sdollar) errorKan1("%s\n","[(getServerEnv) serverName] extension."); + { + char **se; int ii; int nn; + se = getServerEnv(KopString(obj1)); + if (se == NULL) { + debugServerEnv(KopString(obj1)); + rob = NullObject; + }else{ + for (ii=0,nn=0; se[ii] != NULL; ii++) nn++; + rob = newObjectArray(nn); + for (ii=0; ii