===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxmain.c,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- OpenXM/src/kxx/oxmain.c	2002/05/02 08:33:47	1.11
+++ OpenXM/src/kxx/oxmain.c	2004/02/23 09:03:43	1.15
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.10 2002/05/02 03:08:28 takayama Exp $  */
+/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.14 2003/11/20 07:18:41 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;
 
@@ -38,6 +41,10 @@ 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 +57,17 @@ main(int argc, char *argv[]) {
   int reverse = 0;
   extern int OpenedSocket;
   char portfile[1024];
-  char *pass;
+  char *pass = NULL;
   int result;
   int sleepingTime = 0;
+  extern int OxTerminateMode;
 
   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) {
@@ -217,6 +227,7 @@ 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," [-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");
@@ -250,10 +261,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 +314,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 +332,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,7 +383,6 @@ restoreLockCtrlCForOx() { ; }
 static int findOxServer(char *server) {
   char *p;
   char *p2;
-  char *getenv(char *s);
   if (strlen(server) == 0) return(-1);
   /* fd = open(server,O_RDONLY); */
   if (access(server,X_OK&R_OK) == 0) {