===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxmain.c,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- OpenXM/src/kxx/oxmain.c	2001/12/28 01:20:27	1.9
+++ 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.8 2001/05/06 08:11:48 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;
 
@@ -49,16 +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) {
@@ -79,6 +82,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) {
@@ -216,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");
@@ -249,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);
@@ -291,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) {
@@ -333,13 +350,11 @@ 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) {
+  /* fd = open(server,O_RDONLY); */
+  if (access(server,X_OK&R_OK) == 0) {
     fprintf(stderr,"Starting OX server : %s\n",server);
-    close(fd);
     return(0);
   }
   if (server[0] == '/') {
@@ -354,15 +369,14 @@ 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) {
+  /* 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);
     }
-    close(fd);
     return(0);
   }
   couldNotFind(p2);