===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxmain.c,v
retrieving revision 1.10
retrieving revision 1.19
diff -u -p -r1.10 -r1.19
--- OpenXM/src/kxx/oxmain.c	2002/05/02 03:08:28	1.10
+++ OpenXM/src/kxx/oxmain.c	2004/09/17 08:46:10	1.19
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.9 2001/12/28 01:20:27 takayama Exp $  */
+/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.18 2004/09/17 07:27:28 takayama Exp $  */
 /* nullserver01 */
 #include <stdio.h>
 #include <fcntl.h>
@@ -10,14 +10,17 @@
 #include <netdb.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <stdlib.h>
 /* -lnsl -lsocket /usr/ucblib/libucb.a */
 #include "ox_kan.h"
 #include "serversm.h"
 
 #define SERVERNAME "ox_sm1"
 
+extern char **environ;
 int OxCritical = 0;
 int OxInterruptFlag = 0;
+int OxTerminateMode = 0;
 
 int SerialCurrentControl;
 
@@ -33,11 +36,12 @@ int Do_not_use_control_stream_to_tell_no_server = 1;
 static void errorToStartEngine(void);
 static int findOxServer(char *server);
 static void couldNotFind(char *s);
-#if defined(__CYGWIN__)
-int errno;
-#endif
 /*  gcc -v -c hoge.c */
 
+void *sGC_malloc(int n) {
+  return (void *)malloc(n);
+}
+
 main(int argc, char *argv[]) {
   int fd;
   int size;
@@ -50,16 +54,20 @@ main(int argc, char *argv[]) {
   int reverse = 0;
   extern int OpenedSocket;
   char portfile[1024];
-  char *pass;
+  char *pass = NULL;
+  char *passControl = NULL;
+  char *passData = NULL;
   int result;
   int sleepingTime = 0;
+  extern int OxTerminateMode;
 
+  signal(SIGHUP,SIG_IGN);  /* ignore x of xterm */
   strcpy(sname,"localhost");
   strcpy(ServerName,SERVERNAME);
   i = 1;
   if (argc == 1) {
     oxmainUsage();
-    exit();
+    exit(10);
   }
   while (i<argc) {
     if (strcmp(argv[i],"-host") == 0) {
@@ -80,6 +88,8 @@ main(int argc, char *argv[]) {
       LocalMode = 0;
     }else if (strcmp(argv[i],"-reverse") == 0) {
       reverse = 1;
+    }else if (strcmp(argv[i],"-finish") == 0) {
+      OxTerminateMode = 1;
     }else if (strcmp(argv[i],"-portfile") == 0) {
       i++;
       if (i<argc) {
@@ -93,6 +103,16 @@ main(int argc, char *argv[]) {
       if (i<argc) {
         pass = argv[i];
       }
+    }else if (strcmp(argv[i],"-passData") == 0) {
+      i++;
+      if (i<argc) {
+        passData = argv[i];
+      }
+    }else if (strcmp(argv[i],"-passControl") == 0) {
+      i++;
+      if (i<argc) {
+        passControl = argv[i];
+      }
     }else if (strcmp(argv[i],"-wait") == 0) {
       i++;
       if (i<argc) {
@@ -119,10 +139,19 @@ main(int argc, char *argv[]) {
     fprintf(stderr,"\nTrying to connect\n");
   }
 
+  if ((pass != NULL) && (passData == NULL)) {
+	passData = pass;
+  }
+  if ((pass != NULL) && (passControl == NULL)) {
+    passControl = pass;
+  }
+
+  /* Decrypt passControl and passData, here. Lookup cryptmethod. */
+
   if (reverse) {
     /* The order is very important. */
-    fdControl = socketConnectWithPass(sname,portControl,pass);
-    fdStream = socketConnectWithPass(sname,portStream,pass);
+    fdControl = socketConnectWithPass(sname,portControl,passControl);
+    fdStream = socketConnectWithPass(sname,portStream,passData);
 
     fprintf(stderr,"Connected: control = %d, data = %d.\n",fdControl,fdStream);
     result = 0;
@@ -188,6 +217,37 @@ main(int argc, char *argv[]) {
     }
   }
 
+  if (passControl != NULL) {
+	char *s; int mm;
+	fprintf(stderr,"passControl\n");
+	mm = strlen(passControl);
+	s = (char *) malloc(mm+1);
+    if (s == NULL) {fprintf(stderr,"No more memory.\n"); exit(1); }
+	if (read(fdControl,s,mm+1) < 0) {
+	  fprintf(stderr,"Read error to read passControl\n"); sleep(5); exit(1);
+	}
+    s[mm] = 0;
+	if (strcmp(s,passControl) != 0) {
+	  fprintf(stderr,"s=%s and passControl=%s  do not match.\n",s,passControl); sleep(5); exit(1);
+	}
+	free(s);
+  }
+  if (passData != NULL) {
+	char *s; int mm;
+	mm = strlen(passData);
+	fprintf(stderr,"passData\n");
+	s = (char *) malloc(mm+1);
+    if (s == NULL) {fprintf(stderr,"No more memory.\n"); exit(1); }
+	if (read(fdStream,s,mm+1) < 0) {
+	  fprintf(stderr,"Read error to read passData\n");
+	  errorToStartEngine();
+	}
+	if (strcmp(s,passData) != 0) {
+	  fprintf(stderr,"s=%s and passData=%s  do not match.\n",s,passData); 
+	  errorToStartEngine();
+	}
+    free(s);
+  }
 
   result = 0;
   if (portControl != -1) {
@@ -216,12 +276,14 @@ static void errorToStartEngine(void) {
 oxmainUsage() {
   fprintf(stderr,"Usage: \n");
   fprintf(stderr,"  ox [-ox serverprogram -host name -data portnum -control portnum -monitor]\n");
-  fprintf(stderr," [-insecure -portfile fname -reverse -pass xxxyyyzzz]");
+  fprintf(stderr," [-insecure -portfile fname -reverse -passControl xxxyyyzzz -passData pppqqqrrr]");
+  fprintf(stderr," [-finish]");
   fprintf(stderr,"\n");
   fprintf(stderr,"-reverse: ox server connects to the client.\n");
-  fprintf(stderr,"          The client must give a one time password to ox server to connect to the client with -pass option.\n");
+  fprintf(stderr,"          The client must give a one time password to ox server to connect to the client with -pass* option.\n");
   fprintf(stderr,"          The one time password can be seen by ps command, so you must not use this one time password system on an untrustful host.\n");
   fprintf(stderr,"          The one time password should be sent by a safe communication line like ssh and the ox server should be started by ssh. Do not use rsh\n");
+  fprintf(stderr,"          (The option -pass is obsolete.)\n");
   fprintf(stderr,"          If -reverse is not given, the client connect to the ox server\n");
   fprintf(stderr,"          See OpenXM/src/SSkan/Doc/ox.sm1, /sm1connectr\n");
   fprintf(stderr,"-insecure : \n");
@@ -250,10 +312,21 @@ parentServerMain(int fdControl, int fdStream) {
   int r;
   int message = 1;
   int controlByteOrder;
-
+  extern OxTerminateMode;
   extern void myServerExit();
 
-  controlByteOrder = oxTellMyByteOrder(fdControl);
+  if (OxTerminateMode) {
+	/*
+	  OxTerminateMode cannot be used if you run ox by xterm -exec ox ...
+	 */
+	if (fork()) {
+	  close(fdControl); close(fdStream);
+	  /* Parent */
+	  exit(0);  /*Tell the caller that launching is successfully finished.*/
+	}
+  }
+  
+  controlByteOrder = oxTellMyByteOrder(fdControl,fdControl);
   /* Set the network byte order. */
   fprintf(stderr,"controlByteOrder=%x\n",controlByteOrder);
 
@@ -292,7 +365,7 @@ parentServerMain(int fdControl, int fdStream) {
 void myServerExit() {
   printf("Sending the kill signal to the child.\n");
   kill(MyServerPid,SIGKILL);
-  exit();
+  exit(0);
 }
 
 childServerMain(int fdControl, int fdStream) {
@@ -310,14 +383,41 @@ childServerMain(int fdControl, int fdStream) {
     }
   }
   fprintf(stderr,"childServerMain: Starting the server %s\n",ServerName); fflush(NULL);
+
+  /*  
+  {
+	int i;
+	i=0;
+	while (environ[i] != NULL) {
+	  fprintf(stderr,"%s ",environ[i++]);
+	}
+	fprintf(stderr,"\n");
+  }
+  */
+  /* bug: xterm of potato does not seem to pass the LD_LIBRARY_PATH.
+      So, the new gc does not work.
+     it is an workaround for OpenXM */
+  if (getenv("LD_LIBRARY_PATH") == (char *)NULL) {
+	char *s,*o;
+    fprintf(stderr,"Hmm... LD_LIBRARY_PATH does not seem to be set.\n");
+    o = getenv("OpenXM_HOME");
+	if (o == NULL) {
+	  fprintf(stderr,"Giving up to set the LD_LIBRARY_PATH variable.\n");
+	}else{
+	  s = (char *)malloc(strlen(o)+64);
+	  sprintf(s,"LD_LIBRARY_PATH=%s/lib",o);
+	  putenv(s);
+	}
+  }
+
   if (PacketMonitor) {
-    if (execl(ServerName,ServerName,"-monitor",NULL)) {
+    if (execle(ServerName,ServerName,"-monitor",NULL,environ)) {
       fprintf(stderr,"%s cannot be executed with -monitor.\n",ServerName);
       fflush(NULL);
       return(-1);
     }
   }else {
-    if (execl(ServerName,ServerName,NULL)) {
+    if (execle(ServerName,ServerName,NULL,environ)) {
       fprintf(stderr,"%s cannot be executed.\n",ServerName);
       fflush(NULL);
       return(-1);
@@ -334,14 +434,10 @@ restoreLockCtrlCForOx() { ; }
 static int findOxServer(char *server) {
   char *p;
   char *p2;
-  int fd;
-  char *getenv(char *s);
   if (strlen(server) == 0) return(-1);
   /* fd = open(server,O_RDONLY); */
-  fd = access(server,X_OK&R_OK);
-  if (fd >= 0) {
+  if (access(server,X_OK&R_OK) == 0) {
     fprintf(stderr,"Starting OX server : %s\n",server);
-    close(fd);
     return(0);
   }
   if (server[0] == '/') {
@@ -357,15 +453,13 @@ static int findOxServer(char *server) {
   if (p2 == NULL) { fprintf(stderr,"No more memory.\n"); exit(10); }
   strcpy(p2,p); strcat(p2,"/bin/"); strcat(p2,server);
   /* fd = open(p2,O_RDONLY); */
-  fd = access(p2,X_OK&R_OK);
-  if (fd >= 0) {
+  if (access(p2,X_OK&R_OK) == 0) {
     fprintf(stderr,"Starting OX server : %s\n",p2);
     if (strlen(p2) < SERVERNAME_SIZE) strcpy(server,p2);
     else {
       couldNotFind("Too long ox server name.");
       return(-1);
     }
-    close(fd);
     return(0);
   }
   couldNotFind(p2);