=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.6 retrieving revision 1.17 diff -u -p -r1.6 -r1.17 --- OpenXM/src/kan96xx/Kan/ext.c 2001/08/09 22:13:58 1.6 +++ 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.5 2001/05/04 01:06:23 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.16 2003/08/26 12:46:05 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; @@ -35,9 +40,14 @@ static void mywait() { } #define SIZE_OF_ENVSTACK 5 -static jmp_buf EnvStack[SIZE_OF_ENVSTACK]; +#if defined(__CYGWIN__) +#define JMP_BUF sigjmp_buf +#else +#define JMP_BUF jmp_buf +#endif +static JMP_BUF EnvStack[SIZE_OF_ENVSTACK]; static int Envp = 0; -static void pushEnv(jmp_buf jb) { +static void pushEnv(JMP_BUF jb) { if (Envp < SIZE_OF_ENVSTACK) { *(EnvStack[Envp]) = *jb; Envp++; @@ -46,7 +56,7 @@ static void pushEnv(jmp_buf jb) { exit(2); } } -static void popEnv(jmp_buf jbp) { +static void popEnv(JMP_BUF jbp) { if (Envp <= 0) { fprintf(stderr,"Underflow of EnvStack.\n"); exit(3); @@ -81,12 +91,16 @@ 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; extern struct context *CurrentContextp; +#if (__CYGWIN__) + extern sigjmp_buf EnvOfStackMachine; +#else extern jmp_buf EnvOfStackMachine; +#endif extern void ctrlC(); extern int SigIgn; extern errno; @@ -152,7 +166,17 @@ struct object Kextension(struct object obj) obj1 = getoa(obj,1); if (obj1.tag != Sdollar) errorKan1("%s\n","[(getenv) envstr] extension"); abc = getenv(KopString(obj1)); +#if defined(__CYGWIN__) if (abc == NULL) { + abc2 = (char *)sGC_malloc(sizeof(char)*(strlen(KopString(obj1))+2)); + strcpy(abc2,KopString(obj1)); + for (i=0; i 0) { /* parent */ - if (m&3) { + if (m&2) { /* Do not call singal to turn around a trouble on cygwin. BUG. */ }else{ signal(SIGCHLD,mywait); /* to kill Zombie */ @@ -212,7 +239,7 @@ struct object Kextension(struct object obj) close(KopInteger(getoa(obj2,i))); } /* execl */ - if ((m&1) == 1) { + if (m&1) { { sigset_t sss; sigemptyset(&sss); @@ -229,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