===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.26
retrieving revision 1.34
diff -u -p -r1.26 -r1.34
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2001/09/20 10:44:18	1.26
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2001/12/21 08:23:14	1.34
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.25 2001/08/20 09:03:26 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.33 2001/10/22 09:14:35 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -134,10 +134,7 @@ void ox_main(int argc,char **argv) {
 	int id;
 	int cmd;
 	Obj obj;
-	USINT ui;
 	ERR err;
-	LIST list;
-	NODE n,n1;
 	unsigned int serial;
 	int ret;
 	extern char LastError[];
@@ -522,11 +519,9 @@ static void asir_executeFunction(int serial)
 	int argc;
 	FUNC f;
 	Obj result;
-	VL vl;
 	NODE n,n1; 
 	STRING fname;
 	char *path;
-	USINT ui;
 	ERR err;
 	Obj arg;
 	static char buf[BUFSIZ];
@@ -641,7 +636,6 @@ Obj asir_peek_one() {
 
 void ox_asir_init(int argc,char **argv)
 {
-	int tmp;
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
 	extern int read_exec_file;
@@ -652,6 +646,9 @@ void ox_asir_init(int argc,char **argv)
 	FILE *ifp;
 	char *homedir;
 	char *ptr;
+#if !defined(VISUAL)
+	int tmp;
+#endif
 
 #if !defined(VISUAL) && !MPI
 	do_server_in_X11 = 1; /* XXX */
@@ -706,9 +703,8 @@ void ox_asir_init(int argc,char **argv)
 		fclose(ifp);
 	}
 	input_init(0,"string");
-#if !MPI
+/* XXX Windows compatibility */
 	ox_io_init();
-#endif
 	create_my_mathcap("ox_asir");
 }
 
@@ -716,9 +712,25 @@ void ox_io_init() {
 	unsigned char c,rc;
 	extern int I_am_server;
 
-	/* XXX : ssh forwards stdin to a remote host */
-	fclose(stdin);
+	/* XXX : ssh forwards stdin to a remote host on PC Unix */
+#if defined(linux)
+#include <sys/param.h>
+	int i;
 
+	close(0);
+	for ( i = 5; i < NOFILE; i++ )
+		close(i);
+#elif defined(__FreeBSD__)
+#include <sys/resource.h>
+	int i;
+	struct rlimit rl;
+
+	getrlimit(RLIMIT_NOFILE,&rl);
+	close(0);
+	for ( i = 5; i < rl.rlim_cur; i++ )
+		close(i);
+#endif
+
 	I_am_server = 1;
 	endian_init();
 #if defined(VISUAL)
@@ -730,8 +742,10 @@ void ox_io_init() {
 	iofp[0].in = fdopen(3,"r");
 	iofp[0].out = fdopen(4,"w");
 
+#if !defined(__CYGWIN__)
 	setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ);
 	setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ);
+#endif
 	signal(SIGUSR1,ox_usr1_handler);
 #endif
 	asir_OperandStackSize = BUFSIZ;
@@ -770,7 +784,7 @@ void asir_ox_push_cmo(void *cmo)
 
 /*
  * Pop an object from the stack and converts it
- * int a binary encoded CMO.
+ * into a binary encoded CMO.
  */
 
 int asir_ox_pop_cmo(void *cmo, int limit)
@@ -792,6 +806,30 @@ int asir_ox_pop_cmo(void *cmo, int limit)
 		return len;
 	} else
 		return -1;
+}
+
+int asir_ox_pop_string(void *string, int limit)
+{
+	Obj val;
+	int l;
+
+	val = asir_pop_one();
+	if ( !val ) {
+		if ( limit >= 2 ) {
+			sprintf(string,"0");
+			l = strlen(string);
+		} else
+			l = -1;
+	} else {
+		l = estimate_length(CO,val);
+		if ( l+1 <= limit ) {
+			soutput_init(string);
+			sprintexpr(CO,val);
+			l = strlen(string);
+		} else
+			l = -1;
+	}
+	return l;
 }
 
 /*