===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/ext.c,v
retrieving revision 1.13
retrieving revision 1.21
diff -u -p -r1.13 -r1.21
--- OpenXM/src/kan96xx/Kan/ext.c	2002/11/10 07:00:05	1.13
+++ 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.12 2002/10/24 05:19:50 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/ext.c,v 1.20 2003/12/04 07:49:24 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -12,8 +12,12 @@
 #include "extern2.h"
 #include <signal.h>
 #include "plugin.h"
+#include "kclass.h"
 #include <ctype.h>
+#include "ox_pathfinder.h"
 
+extern char **environ;
+
 #define MYCP_SIZE 100
 static int Mychildren[MYCP_SIZE];
 static int Mycp = 0;
@@ -21,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<Mycp; i++) {
@@ -203,8 +207,11 @@ struct object Kextension(struct object obj)
   }else if (strcmp(key,"forkExec")==0) {
     if (size != 4) errorKan1("%s\n","[(forkExec) argList fdList sigblock] extension.");
     obj1 = getoa(obj,1);
+	if (obj1.tag == Sdollar) {
+	  obj1 = KstringToArgv(obj1);
+	}
     if (obj1.tag != Sarray) errorKan1("%s\n","[(forkExec) argList fdList sigblock] extension. array argList.");
-    obj2 = getoa(obj,2);
+	obj2 = getoa(obj,2);
     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.");
@@ -255,7 +262,7 @@ struct object Kextension(struct object obj)
 	sleep(5);
         fprintf(stderr,">>>\n");
       }
-      execv(argv[0],argv);
+      execve(argv[0],argv,environ);
       /* This place will never be reached unless execv fails. */
       fprintf(stderr,"forkExec fails: ");
       for (i=0; i<argListc; i++) {
@@ -311,6 +318,24 @@ 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,"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<nn; ii++) {
+          putoa(rob,ii,KpoString(se[ii]));
+        }
+      }
+    }
   }else if (strcmp(key,"regionMatches")==0) {
     if (size != 3) errorKan1("%s\n","[(regionMatches) str strArray] extension.");
     obj1 = getoa(obj,1);
@@ -318,6 +343,26 @@ struct object Kextension(struct object obj)
 	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<KopInteger(obj1); i++) {
+      putoa(rob,i,newObjectArray(KopInteger(obj2)));
+	}
+  }else if (strcmp(key,"ooPower")==0) {
+    if (size != 3) errorKan1("%s\n","[(ooPower) a b] extension.");
+    obj1 = getoa(obj,1);
+	obj2 = getoa(obj,2);
+    rob = KooPower(obj1,obj2);
   }else if (strcmp(key,"ostype")==0) {
     rob = newObjectArray(1);
     /* Hard encode the OS type. */
@@ -328,6 +373,7 @@ struct object Kextension(struct object obj)
 #endif
   }
 #include "plugin.hh"
+#include "Kclass/tree.hh"
   else{
     errorKan1("%s\n","Unknown tag for extension.");
   }