=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.6 retrieving revision 1.33 diff -u -p -r1.6 -r1.33 --- OpenXM/src/kan96xx/Kan/ext.c 2001/08/09 22:13:58 1.6 +++ OpenXM/src/kan96xx/Kan/ext.c 2004/11/23 01:37:47 1.33 @@ -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.32 2004/09/17 12:32:11 takayama Exp $ */ #include #include #include @@ -12,17 +12,26 @@ #include "extern2.h" #include #include "plugin.h" +#include "kclass.h" +#include +#include +#include +#include "ox_pathfinder.h" +extern int Quiet; +extern char **environ; + #define MYCP_SIZE 100 static int Mychildren[MYCP_SIZE]; static int Mycp = 0; +static int Verbose_mywait = 0; 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); + if ((!Quiet) && (Verbose_mywait)) fprintf(stderr,"Child process %d is exiting.\n",pid); for (i=0; iuserDictionary); + }else if (strcmp(key,"or_attrs")==0) { + if (size != 2) errorKan1("%s\n","[(or_attrs) num] extension."); + obj1 = getoa(obj,1); + if (obj1.tag != Sinteger) errorKan1("%s\n","[(or_attrs) num] extension."); + m = KopInteger(obj1); + putUserDictionary2((char *)NULL,0,0,m | OR_ATTR_FOR_ALL_WORDS, + CurrentContextp->userDictionary); }else if (strcmp(key,"keywords")==0) { if (size != 1) errorKan1("%s\n","[(keywords)] extension."); rob = showSystemDictionary(1); @@ -152,7 +180,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 +259,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 +276,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,"or_attr")==0) { + if (size != 3) errorKan1("%s\n","[(or_attr) num symbol] extension."); + obj1 = getoa(obj,1); + obj2 = getoa(obj,2); + if (obj1.tag != Sinteger) errorKan1("%s\n","[(or_attr) num symbol] extension."); + if (obj2.tag != Sstring) errorKan1("%s\n","[(or_attr) num symbol] extension."); + m = KopInteger(obj1); + rob = KfindUserDictionary(obj2.lc.str); + if (rob.tag != NoObject.tag) { + if (strcmp(UD_str,obj2.lc.str) == 0) { + m |= UD_attr; + }else errorKan1("%s\n","or_attr: internal error."); + } + rob = KpoInteger(m); + putUserDictionary2(obj2.lc.str,(obj2.rc.op->lc).ival,(obj2.rc.op->rc).ival, + m,CurrentContextp->userDictionary); + }else if (strcmp(key,"getattr")==0) { + if (size != 2) errorKan1("%s\n","[(getattr) symbol] extension."); + obj1 = getoa(obj,1); + if (obj1.tag != Sstring) errorKan1("%s\n","[(getattr) symbol] extension."); + rob = KfindUserDictionary(obj1.lc.str); + if (rob.tag != NoObject.tag) { + if (strcmp(UD_str,obj1.lc.str) == 0) { + rob = KpoInteger(UD_attr); + }else errorKan1("%s\n","getattr: internal error."); + }else rob = NullObject; + }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; ii0) { + n = read(fd, s, total); + if (n < 0) { perror("read"); errorKan1("%s\n","[(read) ...]; read error.");} + s[n] = 0; + total -= n; s = &(s[n]); + } + rob = KpoString(s0); + } + }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,"newVector")==0) { + if (size != 2) errorKan1("%s\n","[(newVector) m] extension."); + obj1 = getoa(obj,1); + if (obj1.tag != Sinteger) errorKan1("%s\n","[(newVector) m] extension. m must be an integer."); + rob = newObjectArray(KopInteger(obj1)); + }else if (strcmp(key,"newMatrix")==0) { + if (size != 3) errorKan1("%s\n","[(newMatrix) m n] extension."); + obj1 = getoa(obj,1); + if (obj1.tag != Sinteger) errorKan1("%s\n","[(newMatrix) m n] extension. m must be an integer."); + obj2 = getoa(obj,2); + if (obj2.tag != Sinteger) errorKan1("%s\n","[(newMatrix) m n] extension. n must be an integer."); + rob = newObjectArray(KopInteger(obj1)); + for (i=0; i