===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/shell.c,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- OpenXM/src/kan96xx/Kan/shell.c	2003/12/13 13:29:44	1.9
+++ OpenXM/src/kan96xx/Kan/shell.c	2004/10/14 10:08:09	1.12
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/shell.c,v 1.8 2003/12/05 07:05:24 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/shell.c,v 1.11 2004/02/23 09:03:42 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -125,9 +125,13 @@ static struct object KoxShell_test1(struct object ob) 
     rob = testmain(ob);
   }else if (strcmp(cmd,"which")==0) {
     if (n == 2) {
+      pathFinderErrorVerbose(0); 
       rob = KoxWhich(getoa(ob,1),KpoInteger(0));
+      pathFinderErrorVerbose(-1); 
     }else if (n==3) {
+      pathFinderErrorVerbose(0); 
       rob = KoxWhich(getoa(ob,1),getoa(ob,2));
+      pathFinderErrorVerbose(-1); 
     }else{
       errorKan1("%s\n","shell: << which command-name >> or << which command-name path >>");
     }
@@ -173,6 +177,28 @@ struct object KoxWhich(struct object cmdo,struct objec
   return(rob);
 }
 
+static int mysetenv(char *name, char *value, int overwrite);
+static int myunsetenv(char *name);
+static int mysetenv(char *name, char *value, int overwrite) {
+  char *s;
+  char *orig;
+  s = (char *)getenv(name);
+  if ((s == NULL) || overwrite) {
+	s = (char *) mymalloc(strlen(name)+strlen(value)+5);
+	if (s == 0) { fprintf(stderr,"No more memory.\n"); exit(10); }
+    strcpy(s,name);
+	strcat(s,"="); strcat(s,value);
+	return(putenv(s));
+  }
+  return (0);
+} 
+
+/* bug on Solaris. It does not unsetenv.
+   libc4, libc5, glibc. It does unsetenv. */
+static myunsetenv(char *name) {
+  return(putenv(name));
+}
+
 /* Example. [(export)  (PATH)  (=)  (/usr/new/bin:$PATH)] */
 static struct object oxsSetenv(struct object ob) {
   struct object rob;
@@ -197,9 +223,10 @@ static struct object oxsSetenv(struct object ob) {
     /* printf("%s\n",new); */
     new = oxEvalEnvVar(new);
     /* printf("%s\n",new); */
-    r = setenv(envp,new,1);
+    r = mysetenv(envp,new,1);
   }else{
-    unsetenv(envp); r = 0;
+    myunsetenv(envp); r = 0;
+    /* bug: On Solaris, unsetenv will not work. */
   }
   if (r != 0) errorKan1("%s\n","setenv failed.");
   new = (char *) getenv(envp);