===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.27
retrieving revision 1.41
diff -u -p -r1.27 -r1.41
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2001/09/20 23:11:42	1.27
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2003/02/14 22:29:15	1.41
@@ -44,25 +44,26 @@
  * 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.26 2001/09/20 10:44:18 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.40 2002/08/02 02:28:27 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "signal.h"
 #include "ox.h"
 #include "version.h"
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
 void ox_usr1_handler();
 int asir_ox_init();
 
+/* environement is defined in libpari.a */
 extern jmp_buf environnement;
 
 extern int do_message;
 extern int ox_flushing;
-extern jmp_buf ox_env;
+extern JMP_BUF ox_env;
 extern MATHCAP my_mathcap;
 
 extern int little_endian,ox_sock_id;
@@ -77,7 +78,7 @@ Obj *asir_OperandStack;
 int asir_OperandStackPtr = -1;
 
 void ox_io_init();
-void ox_asir_init(int,char **);
+void ox_asir_init(int,char **,char *);
 Obj asir_pop_one();
 Obj asir_peek_one();
 void asir_push_one(Obj);
@@ -97,7 +98,7 @@ char *name_of_id(int);
 static void asir_do_cmd(int,unsigned int);
 static void asir_executeFunction(int);
 
-#if MPI
+#if defined(MPI)
 /* XXX : currently MPI version supports only a homogeneous cluster. */
 
 extern int mpi_nprocs,mpi_myid;
@@ -134,18 +135,15 @@ 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[];
 
-	ox_asir_init(argc,argv);
+	ox_asir_init(argc,argv,"ox_asir");
 	if ( do_message )
 		fprintf(stderr,"I'm an ox_asir, Version %d.\n",ASIR_VERSION);
-	if ( setjmp(ox_env) ) {
+	if ( SETJMP(ox_env) ) {
 		while ( NEXT(asir_infile) )
 			closecurrentinput();
 		ox_send_sync(0);
@@ -174,7 +172,7 @@ void ox_main(int argc,char **argv) {
 					break;
 				if ( do_message )
 					fprintf(stderr," %s\n",name_of_cmd(cmd));
-				if ( ret = setjmp(main_env) ) {
+				if ( ret = SETJMP(main_env) ) {
 					if ( ret == 1 ) {
 						create_error(&err,serial,LastError);
 						asir_push_one((Obj)err);
@@ -489,8 +487,9 @@ int asir_executeString()
 	SNODE snode;
 	pointer val;
 	char *cmd;
-#if PARI
+#if defined(PARI)
 	recover(0);
+	/* environement is defined in libpari.a */
 	if ( setjmp(environnement) ) {
 		avma = top; recover(1);
 		resetenv("");
@@ -522,11 +521,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];
@@ -639,25 +636,28 @@ Obj asir_peek_one() {
 	}
 }
 
-void ox_asir_init(int argc,char **argv)
+void ox_asir_init(int argc,char **argv,char *servername)
 {
-	int tmp;
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
 	extern int read_exec_file;
 	extern int do_asirrc;
 	extern int do_server_in_X11;
+	extern char displayname[];
 	char *getenv();
 	static ox_asir_initialized = 0;
 	FILE *ifp;
 	char *homedir;
 	char *ptr;
+#if !defined(VISUAL)
+	int tmp;
+#endif
 
-#if !defined(VISUAL) && !MPI
+#if !defined(VISUAL) && !defined(MPI)
 	do_server_in_X11 = 1; /* XXX */
 #endif
 	asir_save_handler();
-#if PARI
+#if defined(PARI)
 	risa_pari_init();
 #endif
 	srandom((int)get_current_time());
@@ -667,6 +667,10 @@ void ox_asir_init(int argc,char **argv)
 	endian_init();
 	GC_init();
 	process_args(--argc,++argv);
+#if defined(__CYGWIN__)
+	if ( !displayname[0] )
+		do_server_in_X11 = 0; /* XXX */
+#endif
 	output_init();
 	arf_init();
 	nglob_init();
@@ -698,7 +702,7 @@ void ox_asir_init(int argc,char **argv)
 	}
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(main_env) ) {
+		if ( !SETJMP(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;
@@ -706,31 +710,32 @@ 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");
+	create_my_mathcap(servername);
 }
 
 void ox_io_init() {
 	unsigned char c,rc;
 	extern int I_am_server;
-	int i;
 
-	/* XXX : ssh forwards stdin to a remote host */
-#if defined(linux) || defined(__NeXT__) || defined(ultrix)
+	/* XXX : ssh forwards stdin to a remote host on PC Unix */
+#if defined(linux)
 #include <sys/param.h>
-			close(0);
-			for ( i = 5; i < NOFILE; i++ )
-				close(i);
-#else
+	int i;
+
+	close(0);
+	for ( i = 5; i < NOFILE; i++ )
+		close(i);
+#elif defined(__FreeBSD__)
 #include <sys/resource.h>
-			struct rlimit rl;
+	int i;
+	struct rlimit rl;
 
-			getrlimit(RLIMIT_NOFILE,&rl);
-			close(0);
-			for ( i = 5; i < rl.rlim_cur; i++ )
-				close(i);
+	getrlimit(RLIMIT_NOFILE,&rl);
+	close(0);
+	for ( i = 5; i < rl.rlim_cur; i++ )
+		close(i);
 #endif
 
 	I_am_server = 1;
@@ -744,8 +749,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;
@@ -784,7 +791,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)
@@ -808,6 +815,30 @@ int asir_ox_pop_cmo(void *cmo, int limit)
 		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;
+}
+
 /*
  * Executes an SM command.
  */
@@ -818,7 +849,7 @@ void asir_ox_push_cmd(int cmd)
 	ERR err;
 	extern char LastError[];
 
-	if ( ret = setjmp(main_env) ) {
+	if ( ret = SETJMP(main_env) ) {
 		asir_reset_handler();
 		if ( ret == 1 ) {
 			create_error(&err,0,LastError); /* XXX */
@@ -845,7 +876,7 @@ void asir_ox_execute_string(char *s)
 
 	MKSTR(str,s);
 	asir_push_one((Obj)str);
-	if ( ret = setjmp(main_env) ) {
+	if ( ret = SETJMP(main_env) ) {
 		asir_reset_handler();
 		if ( ret == 1 ) {
 			create_error(&err,0,LastError); /* XXX */
@@ -869,8 +900,7 @@ int asir_ox_peek_cmo_size()
 	Obj obj;
 	int len;
 
-	obj = asir_pop_one();
-	asir_push_one(obj);
+	obj = asir_peek_one();
 	if ( !valid_as_cmo(obj) ) {
 		fprintf(stderr,"The object at the stack top is invalid as a CMO.\n");
 		return 0;
@@ -879,6 +909,20 @@ int asir_ox_peek_cmo_size()
 	return len;
 }
 
+int asir_ox_peek_cmo_string_length()
+{
+	Obj obj;
+	int len;
+
+	obj = asir_peek_one();
+	if ( !valid_as_cmo(obj) ) {
+		fprintf(stderr,"The object at the stack top is invalid as a CMO.\n");
+		return 0;
+	}
+	len = estimate_length(CO,obj);
+	return len+1;
+}
+
 /*
  * Initialization.
  * byteorder=0 => native
@@ -897,11 +941,11 @@ int asir_ox_init(int byteorder)
 	static ox_asir_initialized = 0;
 	FILE *ifp;
 
-#if !defined(VISUAL) && !MPI
+#if !defined(VISUAL) && !defined(MPI)
 	do_server_in_X11 = 0; /* XXX */
 #endif
 	asir_save_handler();
-#if PARI
+#if defined(PARI)
 	risa_pari_init();
 #endif
 	srandom((int)get_current_time());
@@ -930,7 +974,7 @@ int asir_ox_init(int byteorder)
 	sprintf(ifname,"%s/.asirrc",getenv("HOME"));
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(main_env) ) {
+		if ( !SETJMP(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;