=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v retrieving revision 1.5 retrieving revision 1.13 diff -u -p -r1.5 -r1.13 --- OpenXM/src/kan96xx/Kan/ext.c 2001/05/04 01:06:23 1.5 +++ OpenXM/src/kan96xx/Kan/ext.c 2002/11/10 07:00:05 1.13 @@ -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.12 2002/10/24 05:19:50 takayama Exp $ */ #include #include #include @@ -12,6 +12,7 @@ #include "extern2.h" #include #include "plugin.h" +#include #define MYCP_SIZE 100 static int Mychildren[MYCP_SIZE]; @@ -35,9 +36,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 +52,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 +87,16 @@ struct object Kextension(struct object obj) struct object keyo; struct object rob = NullObject; struct object obj1,obj2,obj3,obj4; - int m,i; + 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 +162,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) { + 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 +232,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,6 +249,12 @@ struct object Kextension(struct object obj) argv[i] = KopString(getoa(obj1,i)); argv[i+1] = NULL; } + + if (m&4) { + fprintf(stderr,"execv %s\n",argv[0]); + sleep(5); + fprintf(stderr,">>>\n"); + } execv(argv[0],argv); /* This place will never be reached unless execv fails. */ fprintf(stderr,"forkExec fails: "); @@ -258,6 +288,18 @@ struct object Kextension(struct object obj) }else if (strcmp(key,"hilbert")==0) { if (size != 3) errorKan1("%s\n","[(hilbert) obgb obvlist] extension."); rob = hilberto(getoa(obj,1),getoa(obj,2)); + }else if (strcmp(key,"nobody") == 0) { + uid = getuid(); + if (uid == 0) { +#define NOBODY 65534 + /* If I'm a super user, then change uid to nobody. */ + if (setuid(NOBODY) != 0) { + fprintf(stderr,"Failed to change uid to nobody (%d)\n",NOBODY); + exit(10); + } + fprintf(stderr,"uid is changed to nobody (%d).\n",NOBODY); + rob.tag = Snull; + } }else if (strcmp(key,"chattr")==0) { if (size != 3) errorKan1("%s\n","[(chattr) num symbol] extension."); obj1 = getoa(obj,1); @@ -269,6 +311,21 @@ struct object Kextension(struct object obj) errorKan1("%s\n","The number must be 0, 1 or 2."); putUserDictionary2(obj2.lc.str,(obj2.rc.op->lc).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. */ +#if defined(__CYGWIN__) + putoa(rob,0,KpoString("windows")); +#else + putoa(rob,0,KpoString("unix")); +#endif } #include "plugin.hh" else{ @@ -277,5 +334,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