===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.4
diff -u -p -r1.1.1.1 -r1.4
--- OpenXM/src/kan96xx/plugin/oxmisc.c	1999/10/08 02:12:05	1.1.1.1
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	1999/11/27 01:41:11	1.4
@@ -1,3 +1,4 @@
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.3 1999/11/03 08:29:40 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -334,7 +335,7 @@ void oxSendResultOfControl(int fd) 
 
 void oxSendMathCap(ox_stream os,struct mathCap *mathcap)
 {
-  int i,n,infosize;
+  int i,n,infosize,ncmo;
   struct object mathinfo;
   /* printf("ox sending mathcap\n"); fflush(stdout); */
   mathinfo = *((struct object *)(mathcap->infop));
@@ -363,23 +364,23 @@ void oxSendMathCap(ox_stream os,struct mathCap *mathca
 
   /* [2] */
   oxSendInt32(os,CMO_LIST);
-  oxSendInt32(os,2);
+  n = mathcap->oxSize;
+  oxSendInt32(os,n);
 
-  /* first element */
   oxSendInt32(os,CMO_LIST);
-  oxSendInt32(os,mathcap->oxSize);
-  n = mathcap->oxSize;
+  oxSendInt32(os,2);
   for (i=0; i<n; i++) {
+    /* OX_DATA_xxx */
     oxSendCmoInt32(os,(mathcap->ox)[i]);
+    /* OX_DATA_xxx tags. In case of CMO, it is CMO tags. */
+    oxSendInt32(os,CMO_LIST);
+    oxSendInt32(os,mathcap->n);
+    ncmo = mathcap->n;
+    for (i=0; i<ncmo; i++) {
+      oxSendCmoInt32(os,(mathcap->cmo)[i]);
+      /* printf("i=%d %d, ",i,(mathcap->cmo)[i]); */
+    }
   }
-  /* second element */
-  oxSendInt32(os,CMO_LIST);
-  oxSendInt32(os,mathcap->n);
-  n = mathcap->n;
-  for (i=0; i<n; i++) {
-    oxSendCmoInt32(os,(mathcap->cmo)[i]);
-    /* printf("i=%d %d, ",i,(mathcap->cmo)[i]); */
-  }
   /* printf("\n"); fflush(stdout); */
 }
 
@@ -851,11 +852,15 @@ int oxRemovePortFile(void) {
 }
   
 char *oxGenPass(void) {
-  int seed;
+  static int seed = 0;
   long p;
   char *s;
-  seed = (int) time(NULL);
-  srandom((unsigned int) seed);
+  int i;
+  if (seed == 0) {
+    seed = (int) time(NULL) + (int) &p;
+    srandom((unsigned int) seed);
+  }
+  for (i=0; i < ((int) &p) % 100 ; i++) random();
   p = random();
   s = (char *)malloc(128*sizeof(char));
   sprintf(s,"%ld",p);
@@ -913,13 +918,13 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
   /* Authentification by password. */
   m = strlen(pass);
   s = (char *)mymalloc(sizeof(char)*(m+1));
-  read(fdControl,s,m); s[m] = '\0';
+  read(fdControl,s,m+1); s[m] = '\0';
   if (strcmp(s,pass) != 0) {
     fprintf(stderr,"oxCreateClient2(): password authentification failed for control channel.\n");
     close(fdControl);
     return(NULL);
   }
-  read(fdStream,s,m); s[m] = '\0';
+  read(fdStream,s,m+1); s[m] = '\0';
   if (strcmp(s,pass) != 0) {
     fprintf(stderr,"oxCreateClient2(): password authentification failed for data channel.\n");
     close(fdStream);