===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxmisc.c,v
retrieving revision 1.15
retrieving revision 1.20
diff -u -p -r1.15 -r1.20
--- OpenXM/src/kan96xx/plugin/oxmisc.c	2002/11/08 02:54:11	1.15
+++ OpenXM/src/kan96xx/plugin/oxmisc.c	2004/03/08 08:24:42	1.20
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.14 2002/11/07 23:52:20 takayama Exp $ */
+/*  $OpenXM: OpenXM/src/kan96xx/plugin/oxmisc.c,v 1.19 2004/02/25 23:14:35 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <errno.h>
 #define SET_MYERROROUT { if (MyErrorOut == NULL) MyErrorOut=stdout; }
 /* It is also defined in oxmisc2.c */
 FILE *MyErrorOut = NULL;
@@ -444,7 +445,16 @@ void oxReqExecuteFunction(ox_stream os,char *s)
   fp2fflush(os);
 }
 
+void oxReqExecuteFunctionWithOptionalArgument(ox_stream os,char *s)
+{
+  oxSendOXheader(os,OX_DATA,SerialOX++);
+  oxSendCmoString(os,s);
+  oxSendOXheader(os,OX_COMMAND,SerialOX++);
+  oxSendInt32(os,SM_executeFunctionWithOptionalArgument);
+  fp2fflush(os);
+}
 
+
 void oxReqPopString(ox_stream os)
 {
   oxSendOXheader(os,OX_COMMAND,SerialOX++);
@@ -500,7 +510,6 @@ int oxclientMultiSelect(oxclientp clients[],int datare
   int humanfd = 0;
   fd_set readfds;
   struct timeval timeout;
-  extern int errno;
 
   SET_MYERROROUT;
   /** printf("(1)"); fflush(NULL); */
@@ -940,7 +949,8 @@ oxclientp oxCreateClient2(int fdstream,int portStream,
   if (v) fprintf(stderr,"\nStream port %d : Connected.\n",portStream);
 
   if (fdStream == -1 || fdControl == -1) {
-    fprintf(stderr,"\nOpen error in oxCreateClient.\n");
+    fprintf(stderr,"\nOpen error in oxCreateClient2.\n");
+    fprintf(stderr,"fdStream=%d, fdControl=%d\n",fdStream,fdControl);
     return(NULL);
   }
 
@@ -1007,17 +1017,17 @@ int oxSetByteOrder(int fd) {
   return(OX_BYTE_NETWORK_BYTE_ORDER);
 }
 
-int oxTellMyByteOrder(int fd) {  
+int oxTellMyByteOrder(int fdOut, int fdIn) {  
   char data[1];
   int peertype;
   /* It is for server. read and next write. */
 
   /* We support only Network byte order */
   data[0] = OX_BYTE_NETWORK_BYTE_ORDER;
-  write(fd,data,1);
-  fsync(fd);  /* returns 0 if normal. Does it work for socket? */
+  write(fdOut,data,1);
+  fsync(fdOut);  /* returns 0 if normal. Does it work for socket? */
 
-  read(fd,data,1);
+  read(fdIn,data,1); /* Read pear's byte order */
 
   return(OX_BYTE_NETWORK_BYTE_ORDER);
 }
@@ -1047,3 +1057,41 @@ int oxGetClientID() {
   }
 }
 
+char *oxFIDtoStr(int id) {
+  switch( id ) {
+  case SM_mathcap:
+    return "SM_mathcap"; break;
+  case SM_setMathCap:
+    return "SM_setMathCap"; break;
+  case SM_pops:
+    return "SM_pops"; break;
+  case SM_getsp:
+    return "SM_getsp"; break;
+  case SM_dupErrors:
+    return "SM_dupErrors"; break;
+  case SM_pushCMOtag:
+    return "SM_pushCMOtag"; break;
+  case SM_setName:
+    return "SM_setName"; break;
+  case SM_evalName:
+    return "SM_evalName"; break;
+  case SM_executeStringByLocalParser:
+    return "SM_executeStringByLocalParser"; break;
+  case SM_executeFunction:
+    return "SM_executeFunction"; break;
+  case SM_executeFunctionWithOptionalArgument:
+    return "SM_executeFunctionWithOptionalArgument"; break;
+  case SM_popCMO:
+    return "SM_popCMO"; break;
+  case SM_popString:
+    return "SM_popString"; break;
+  case SM_shutdown:
+    return "SM_shutdown"; break;
+  case SM_beginBlock:
+    return "SM_beginBlock"; break;
+  case SM_endBlock:
+    return "SM_endBlock"; break;
+  default:
+    return "Unknown to oxFIDtoStr"; break;
+  }
+}