===================================================================
RCS file: /home/cvs/OpenXM/src/oxc/oxc.c,v
retrieving revision 1.3
retrieving revision 1.11
diff -u -p -r1.3 -r1.11
--- OpenXM/src/oxc/oxc.c	2000/11/18 06:03:42	1.3
+++ OpenXM/src/oxc/oxc.c	2001/01/10 06:54:36	1.11
@@ -1,9 +1,10 @@
 /* -*- mode: C -*- */
-/* $OpenXM: OpenXM/src/oxc/oxc.c,v 1.2 2000/10/13 07:39:10 ohara Exp $ */
+/* $OpenXM: OpenXM/src/oxc/oxc.c,v 1.10 2000/12/16 01:52:32 ohara Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <ctype.h>
 #include <string.h>
 #include "mysocket.h"
 #include "ox_toolkit.h"
@@ -25,79 +26,183 @@ int oxf_connect_dup(char *remote, short port)
 
 int lf_oxc_open_main(char *cmd, short port)
 {
-    int pid = 0;
-    if (cmd != NULL && (pid = fork()) == 0) {
+    pid_t pid;
+    if ((pid = fork()) == 0) {
         oxf_connect_dup(remote_host, port);
         fprintf(stderr, "oxc: oxc_open(%s, %d)\n", cmd, port);
         execlp(cmd, cmd, NULL);
     }
-    fprintf(stderr, "oxc: cannnot oxc_open(%s, %d).\n", cmd, port);
     return pid; /* if error, pid == 0 */
 }
 
+#define MAX_RETRY  2000
+
 OXFILE *connection()
 {
-    OXFILE *oxfp = oxf_connect_active(remote_host, port);
-    if (oxfp != NULL) {
-        oxf_confirm_server(oxfp, password);
-        oxf_determine_byteorder_server(oxfp);
+    OXFILE *oxfp;
+    int counter = MAX_RETRY;
+    while((oxfp = oxf_connect_active(remote_host, port)) == NULL) {
+        if (--counter > 0) {
+            usleep(100); /* spends 100 micro seconds */
+        }else {
+            fprintf(stderr, "oxc: cannot connect.\n");
+            return NULL;
+        }
     }
+    oxf_confirm_server(oxfp, password);
+    oxf_determine_byteorder_server(oxfp);
     return oxfp;
 }
 
+__inline__
+static char *sskip(char *s)
+{
+    while (isspace(*s)) {
+        s++;
+    }
+    return s;
+}
+
+__inline__
+static char *wskip(char *s)
+{
+    while (!isspace(*s) && *s != '\0') {
+        s++;
+    }
+    return s;
+}
+
+static int wc(char *s)
+{
+    int n = 0;
+    s = sskip(s);
+    while(*s != '\0') {
+        s = wskip(s);
+        s = sskip(s);
+        n++;
+    }
+    return n;
+}
+
+static void word(char *str, int argc, char *argv[])
+{
+    int i;
+    char *s = strcpy(malloc(strlen(str)+1), str);
+    for(i=0; i<argc; i++) {
+        s = sskip(s);
+        argv[i] = s;
+        s = wskip(s);
+        *s++ = '\0';
+    }
+    argv[i] = NULL;
+}
+
+__inline__
+static int arglen(char *args[])
+{
+    int len;
+    for(len = 0; args[len] != NULL; len++) {
+        ;
+    }
+    return len;
+}
+
 /* xterm, kterm, rxvt, gnome-terminal, ... */
-static char *xterminal()
+static char **makeargs(char **oldargs)
 {
-	char *e = getenv("OpenXM_XTERM");
-	return (e != NULL)? e: "xterm";
+    char *e = getenv("OpenXM_XTERM");
+    int argc;
+    char **newargs;
+    int len = arglen(oldargs);
+    if (e == NULL) {
+        argc = 1;
+        newargs = malloc((len+1+argc)*sizeof(char *));
+        newargs[0] = "xterm";
+    }else {
+        argc = wc(e);
+        newargs = malloc((len+1+argc)*sizeof(char *));
+        word(e, argc, newargs);
+    }
+    memcpy(newargs+argc, oldargs, (len+1)*sizeof(char *));
+    return newargs;
 }
 
+static int basic0[] =  {
+    CMO_ERROR2,
+    CMO_NULL,
+    CMO_INT32,
+    CMO_DATUM,
+    CMO_STRING,
+    CMO_MATHCAP,
+    CMO_LIST,
+    0
+}; 
+
+/* We assume that data has the following format:
+   LENGTH hostname '\0' port '\0' password '\0'
+   where LENGTH is an integer with network byte order and its value
+   equals to the sum of the length of three data above.
+*/
+
+void pipe_read_info(char **hostname, int *port, char **password);
+
 int main(int argc, char *argv[])
 {
     OXFILE *oxfp;
-	char *port_s = "";
-	char *xterm =  xterminal();
-	char *myname = argv[0];
-	int oxlog = 0;
+    char *port_s = "";
+    char *myname = argv[0];
+    int oxlog = 0;
     int c;
+    int delay = 0;
+    char *delay_s = "0";
 
-    while ((c = getopt(argc, argv, "c:p:h:x")) != -1) {
+    while ((c = getopt(argc, argv, "d:c:p:h:x")) != -1) {
         switch(c) {
         case 'h':
             remote_host = optarg;
             break;
         case 'c':
             password = optarg;
+            
             break;
         case 'p':
             port = atoi(optarg);
-			port_s = optarg;
+            port_s = optarg;
             break;
-		case 'x':
-			if (getenv("DISPLAY") != NULL) {
-				oxlog = 1;
-			}
+        case 'x':
+            if (getenv("DISPLAY") != NULL) {
+                oxlog = 1;
+            }
             break;
+        case 'd':
+            delay_s = optarg;
+            delay = atoi(optarg);
+            break;            
         default:
         }
     }
     argc -= optind;
     argv += optind;
 
-	if (oxlog) {
-		execlp(xterm, xterm, "-e", myname, 
-			   "-h", remote_host, "-p", port_s, "-c", password);
-	}
+    if (strlen(remote_host) == 0) {
+        pipe_read_info(&remote_host, &port, &password);
+        port_s = malloc(32);
+        sprintf(port_s, "%d", port);
+    }
+    if (oxlog) {
+        char *common_args[] = {"-e", myname, "-d", delay_s,
+                          "-h", remote_host, "-p", port_s, "-c", 
+                          password, NULL};
+        char **args = makeargs(common_args);
+        execvp(args[0], args);
+    }
+
     fprintf(stderr, "start connection!\n");
-    if (strlen(remote_host) == 0 || strlen(password) == 0 || port == 0) {
-        fprintf(stderr, "oxc: invalid arguments.\n");
-		fprintf(stderr, "usage: oxc -p port -h host -c password.\n");
-    }else if ((oxfp = connection()) == NULL) {
-        fprintf(stderr, "oxc: cannot connect.\n");
-    }else {
-		fprintf(stderr, "oxc: oxfp = %p, fd = %d\n", oxfp, oxfp->fd);
-	    sysinfo_set(20001006, "v2000.10.06", "oxc");
-		sm(oxfp);
-	}
+    usleep(delay);
+    if ((oxfp = connection()) != NULL) {
+        fprintf(stderr, "oxc: oxfp = %p, fd = %d\n", oxfp, oxfp->fd);
+        mathcap_init(20001006, "v2000.10.06", "oxc", basic0, NULL);
+        sm(oxfp);
+    }
     return 0;
 }