===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.29
retrieving revision 1.36
diff -u -p -r1.29 -r1.36
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2001/10/05 02:33:41	1.29
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2001/12/27 07:51:17	1.36
@@ -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.28 2001/10/05 01:38:21 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.35 2001/12/25 02:39:05 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -58,11 +58,12 @@
 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;
@@ -134,10 +135,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[];
@@ -145,7 +143,7 @@ void ox_main(int argc,char **argv) {
 	ox_asir_init(argc,argv);
 	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);
@@ -491,6 +489,7 @@ int asir_executeString()
 	char *cmd;
 #if 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];
@@ -641,7 +638,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,10 +648,10 @@ void ox_asir_init(int argc,char **argv)
 	FILE *ifp;
 	char *homedir;
 	char *ptr;
-
-#if !MPI
-	ox_io_init();
+#if !defined(VISUAL)
+	int tmp;
 #endif
+
 #if !defined(VISUAL) && !MPI
 	do_server_in_X11 = 1; /* XXX */
 #endif
@@ -701,7 +697,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;
@@ -709,28 +705,32 @@ void ox_asir_init(int argc,char **argv)
 		fclose(ifp);
 	}
 	input_init(0,"string");
+/* XXX Windows compatibility */
+	ox_io_init();
 	create_my_mathcap("ox_asir");
 }
 
 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 +744,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;
@@ -842,7 +844,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 */
@@ -869,7 +871,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 */
@@ -954,7 +956,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;