===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxmain.c,v
retrieving revision 1.5
retrieving revision 1.12
diff -u -p -r1.5 -r1.12
--- OpenXM/src/kxx/oxmain.c	2000/07/30 09:55:40	1.5
+++ OpenXM/src/kxx/oxmain.c	2002/10/28 00:38:32	1.12
@@ -1,7 +1,8 @@
-/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.4 2000/01/31 01:34:23 takayama Exp $  */
+/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.11 2002/05/02 08:33:47 ohara Exp $  */
 /* nullserver01 */
 #include <stdio.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -17,6 +18,7 @@
 
 int OxCritical = 0;
 int OxInterruptFlag = 0;
+int OxTerminateMode = 0;
 
 int SerialCurrentControl;
 
@@ -32,8 +34,11 @@ 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 */
 
-
 main(int argc, char *argv[]) {
   int fd;
   int size;
@@ -46,15 +51,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) {
@@ -75,19 +82,26 @@ 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) {
-		sscanf(argv[i],"%s",portfile);
-		portControl = 0;
-		portStream = 0;
-		NotifyPortnumber = 1;
+        sscanf(argv[i],"%s",portfile);
+        portControl = 0;
+        portStream = 0;
+        NotifyPortnumber = 1;
       }
     }else if (strcmp(argv[i],"-pass") == 0) {
       i++;
       if (i<argc) {
-		pass = argv[i];
+        pass = argv[i];
       }
+    }else if (strcmp(argv[i],"-wait") == 0) {
+      i++;
+      if (i<argc) {
+        sscanf(argv[i],"%d",&sleepingTime);
+      }
     }else {
       fprintf(stderr,"Unknown option %s.\n",argv[i]);
       oxmainUsage(); exit(10);
@@ -96,20 +110,26 @@ main(int argc, char *argv[]) {
   }
 
   if (Do_not_use_control_stream_to_tell_no_server) {
-	if (findOxServer(ServerName) < 0) {
-	  fprintf(stderr,"Sleeping five seconds...\n");
-	  sleep(5);
-	  exit(-1);
-	}
+    if (findOxServer(ServerName) < 0) {
+      fprintf(stderr,"Sleeping five seconds...\n");
+      sleep(5);
+      exit(-1);
+    }
   }
 
+  if (sleepingTime) {
+    fprintf(stderr,"Waiting to connect for %d seconds...\n",sleepingTime);
+    sleep(sleepingTime);
+    fprintf(stderr,"\nTrying to connect\n");
+  }
+
   if (reverse) {
     /* The order is very important. */
     fdControl = socketConnectWithPass(sname,portControl,pass);
     fdStream = socketConnectWithPass(sname,portStream,pass);
 
     fprintf(stderr,"Connected: control = %d, data = %d.\n",fdControl,fdStream);
-	result = 0;
+    result = 0;
 
 
     if (portControl != -1) {
@@ -120,9 +140,9 @@ main(int argc, char *argv[]) {
       result=childServerMain(fdControl,fdStream);
     }
     /* This line will be never executed in case of success */
-	if (result < 0 ) {
-	  errorToStartEngine();
-	}
+    if (result < 0 ) {
+      errorToStartEngine();
+    }
   }
 
   /* non-reverse case. */
@@ -137,7 +157,7 @@ main(int argc, char *argv[]) {
       fdControl = socketOpen(sname,portControl);
       portControl = OpenedSocket;
       if (NotifyPortnumber) {
-		oxWritePortFile(0,portControl,portfile);
+        oxWritePortFile(0,portControl,portfile);
       }
       fdControl = socketAcceptLocal(fdControl);
       fprintf(stderr,"\n control port %d : Connected.\n",portControl);
@@ -146,7 +166,7 @@ main(int argc, char *argv[]) {
       fdStream = socketOpen(sname,portStream);
       portStream = OpenedSocket;
       if (NotifyPortnumber) {
-		oxWritePortFile(1,portStream,portfile);
+        oxWritePortFile(1,portStream,portfile);
       }
       fdStream = socketAcceptLocal(fdStream);
       fprintf(stderr,"\n stream port %d : Connected.\n",portStream);
@@ -156,7 +176,7 @@ main(int argc, char *argv[]) {
       fdControl = socketOpen(sname,portControl);
       portControl = OpenedSocket;
       if (NotifyPortnumber) {
-		oxWritePortFile(0,portControl,portfile);
+        oxWritePortFile(0,portControl,portfile);
       }
       fdControl = socketAccept(fdControl);
       fprintf(stderr,"\n control port %d : Connected.\n",portControl);
@@ -165,7 +185,7 @@ main(int argc, char *argv[]) {
       fdStream = socketOpen(sname,portStream);
       portStream = OpenedSocket;
       if (NotifyPortnumber) {
-		oxWritePortFile(1,portStream,portfile);
+        oxWritePortFile(1,portStream,portfile);
       }
       fdStream = socketAccept(fdStream);
       fprintf(stderr,"\n stream port %d : Connected.\n",portStream);
@@ -187,12 +207,12 @@ main(int argc, char *argv[]) {
 static void errorToStartEngine(void) {
   fprintf(stderr,"Failed to start the engine. Childing process is terminating.\n");
   /* You have to tell to the control server that there is no engine.
-	 And, the control server must tell the client that there is no
-	 engine.
-	 This part has not yet been implemented.
-	 If you implement this, set Do_not_use_control_stream_to_tell_no_server to
-	 zero.
-	 */
+     And, the control server must tell the client that there is no
+     engine.
+     This part has not yet been implemented.
+     If you implement this, set Do_not_use_control_stream_to_tell_no_server to
+     zero.
+  */
   sleep(2);
   exit(-1);
 }
@@ -201,6 +221,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");
@@ -234,9 +255,20 @@ parentServerMain(int fdControl, int fdStream) {
   int r;
   int message = 1;
   int controlByteOrder;
-
+  extern OxTerminateMode;
   extern void myServerExit();
 
+  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);
   /* Set the network byte order. */
   fprintf(stderr,"controlByteOrder=%x\n",controlByteOrder);
@@ -262,7 +294,7 @@ parentServerMain(int fdControl, int fdStream) {
       r=kill(MyServerPid,SIGUSR1);
       if (message) printf("Result = %d\n",r);
       fflush(NULL);
-      oxSendResultOfControlInt32(fdControl,0);
+      /*      oxSendResultOfControlInt32(fdControl,0); */
       break;
     default:
       fprintf(stderr,"[control] Unknown control message.\n");
@@ -276,7 +308,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) {
@@ -285,26 +317,26 @@ childServerMain(int fdControl, int fdStream) {
   dup2(fdStream,3);
   dup2(fdStream,4);  
   /*close(0);
-	#include <sys/param.h>
-	for (i=5; i<NOFILE; i++) close(i); 
-	*/
+    #include <sys/param.h>
+    for (i=5; i<NOFILE; i++) close(i); 
+  */
   if (!Do_not_use_control_stream_to_tell_no_server) {
-	if (findOxServer(ServerName) < 0) {
-	  return(-1);
-	}
+    if (findOxServer(ServerName) < 0) {
+      return(-1);
+    }
   }
   fprintf(stderr,"childServerMain: Starting the server %s\n",ServerName); fflush(NULL);
   if (PacketMonitor) {
     if (execl(ServerName,ServerName,"-monitor",NULL)) {
       fprintf(stderr,"%s cannot be executed with -monitor.\n",ServerName);
-	  fflush(NULL);
-	  return(-1);
+      fflush(NULL);
+      return(-1);
     }
   }else {
     if (execl(ServerName,ServerName,NULL)) {
       fprintf(stderr,"%s cannot be executed.\n",ServerName);
-	  fflush(NULL);
-	  return(-1);
+      fflush(NULL);
+      return(-1);
     }
   }
   /* never reached. */
@@ -318,18 +350,16 @@ 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);
-  if (fd >= 0) {
-	fprintf(stderr,"Starting OX server : %s\n",server);
-	close(fd);
-	return(0);
+  /* fd = open(server,O_RDONLY); */
+  if (access(server,X_OK&R_OK) == 0) {
+    fprintf(stderr,"Starting OX server : %s\n",server);
+    return(0);
   }
   if (server[0] == '/') {
-	couldNotFind(server);
-	return(-1);
+    couldNotFind(server);
+    return(-1);
   }
   fprintf(stderr,"The server %s was not found. Trying to find it under OpenXM/bin\n",server);
   p = getenv("OpenXM_HOME");
@@ -339,16 +369,15 @@ static int findOxServer(char *server) {
   p2 = (char *) malloc(sizeof(char)*(strlen(p)+strlen("/bin/")+3+strlen(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);
-  if (fd >= 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);
+  /* fd = open(p2,O_RDONLY); */
+  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);
+    }
+    return(0);
   }
   couldNotFind(p2);
   return(-1);