===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -p -r1.6 -r1.10
--- OpenXM/src/kan96xx/Kan/ext.c	2001/08/09 22:13:58	1.6
+++ OpenXM/src/kan96xx/Kan/ext.c	2002/07/28 02:48:16	1.10
@@ -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.9 2002/02/24 10:27:18 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -12,6 +12,7 @@
 #include "extern2.h"
 #include <signal.h>
 #include "plugin.h"
+#include <ctype.h>
 
 #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);
@@ -86,7 +92,11 @@ struct object Kextension(struct object obj)
   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<strlen(abc2); i++) {
+		abc2[i] = toupper(abc2[i]);
+	  }
+      abc = getenv(abc2);
+    }
+#endif
+    if (abc == NULL) {
       rob = NullObject;
     }else{
       abc2 = (char *)sGC_malloc(sizeof(char)*(strlen(abc)+2));
@@ -188,12 +208,12 @@ struct object Kextension(struct object obj)
     if (obj2.tag != Sarray) errorKan1("%s\n","[(forkExec) argList fdList sigblock] extension. array fdList.");
     obj3 = getoa(obj,3);
     if (obj3.tag != Sinteger) errorKan1("%s\n","[(forkExec) argList fdList sigblock] extension. integer sigblock.");
-    m = KopInteger(obj3);  /* m == 1 : block ctrl-C. */
+    m = KopInteger(obj3);  /* m&1 : block ctrl-C. */
     argListc = getoaSize(obj1);
     fdListc =  getoaSize(obj2);
     if ((pid = fork()) > 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 +232,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,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: ");
@@ -273,6 +299,14 @@ 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,"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{