=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.5 retrieving revision 1.21 diff -u -p -r1.5 -r1.21 --- OpenXM/src/kan96xx/Kan/ext.c 2001/05/04 01:06:23 1.5 +++ OpenXM/src/kan96xx/Kan/ext.c 2003/12/06 02:49:22 1.21 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.4 2000/03/09 12:04:52 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.20 2003/12/04 07:49:24 takayama Exp $ */ #include #include #include @@ -12,7 +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; @@ -20,7 +25,7 @@ static void mywait() { int status; int pid; int i,j; - signal(SIGCHLD,SIG_IGN); + /* signal(SIGCHLD,SIG_IGN); */ pid = wait(&status); fprintf(stderr,"Child process %d is exiting.\n",pid); for (i=0; i 0) { + if ((pid = fork()) > 0) { /* parent */ - signal(SIGCHLD,mywait); /* to kill Zombie */ - Mychildren[Mycp++] = m; + if (m&2) { + /* Do not call singal to turn around a trouble on cygwin. BUG. */ + }else{ + signal(SIGCHLD,mywait); /* to kill Zombie */ + } + Mychildren[Mycp++] = pid; if (Mycp >= MYCP_SIZE-1) { errorKan1("%s\n","Child process table is full.\n"); Mycp = 0; } - rob = KpoInteger(m); + rob = KpoInteger(pid); /* Done */ }else{ /* Child */ @@ -208,7 +239,7 @@ struct object Kextension(struct object obj) close(KopInteger(getoa(obj2,i))); } /* execl */ - if (m == 1) { + if (m&1) { { sigset_t sss; sigemptyset(&sss); @@ -225,7 +256,13 @@ struct object Kextension(struct object obj) argv[i] = KopString(getoa(obj1,i)); argv[i+1] = NULL; } - execv(argv[0],argv); + + if (m&4) { + fprintf(stderr,"execv %s\n",argv[0]); + sleep(5); + fprintf(stderr,">>>\n"); + } + 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