===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.71
retrieving revision 1.78
diff -u -p -r1.71 -r1.78
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2013/06/13 18:42:11	1.71
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2016/08/24 08:21:03	1.78
@@ -44,24 +44,24 @@
  * 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.70 2011/01/13 08:00:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.77 2016/08/24 05:33:58 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "signal.h"
 #include "ox.h"
 #include "version.h"
-#if defined(PARI)
-#include "genpari.h"
-#endif
 
+char *find_asirrc();
 void ox_usr1_handler();
 int asir_ox_init();
 
 /* environement is defined in libpari.a */
+#if 0
 # if !( PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;
 # endif
+#endif
 extern int myrank_102,nserver_102;
 
 extern int do_message;
@@ -163,19 +163,9 @@ void ox_main(int argc,char **argv) {
 		ox_send_sync(0);
 	}
 	while ( 1 ) {
-		extern int recv_intr;
-
 		serial = ox_recv(0,&id,&obj);
-#if defined(VISUAL)
-		if ( recv_intr ) {
-			if ( recv_intr == 1 ) {
-				recv_intr = 0;
-				int_handler(SIGINT);
-			} else {
-				recv_intr = 0;
-				ox_usr1_handler(0);
-			}
-		}
+#if defined(VISUAL) || defined(__MINGW32__)
+		check_intr();
 #endif
 		if ( do_message )
 			fprintf(stderr,"#%d Got %s",serial,name_of_id(id));
@@ -705,6 +695,7 @@ int asir_executeString()
 	SNODE snode;
 	pointer val;
 	char *cmd;
+#if 0
 #if defined(PARI)
 	recover(0);
 	/* environement is defined in libpari.a */
@@ -715,6 +706,7 @@ int asir_executeString()
 	}
 # endif
 #endif
+#endif
 	cmd = ((STRING)asir_pop_one())->body;
 /* XXX : probably this is useless */
 #if 0
@@ -939,29 +931,27 @@ Obj asir_peek_one() {
 
 void ox_asir_init(int argc,char **argv,char *servername)
 {
-	char ifname[BUFSIZ];
+	char *ifname;
 	extern int GC_dont_gc;
 	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;
 	int do_server_sav;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	int tmp;
 #endif
 
 	GC_init();
-#if !defined(VISUAL) && !defined(MPI)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(MPI)
 	do_server_in_X11 = 1; /* XXX */
 #endif
 	asir_save_handler();
+#if 0
 #if defined(PARI)
 	risa_pari_init();
 #endif
+#endif
 	srandom((int)get_current_time());
 
 	rtime_init();
@@ -984,31 +974,16 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	sysf_init();
 	parif_init();
 	order_init();
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	init_socket();
 #endif
 #if defined(UINIT)
 	reg_sysf();
 #endif
-/* if ASIR_CONFIG is set, execute it; else execute .asirrc */
-	if ( ptr = getenv("ASIR_CONFIG") )
-		strcpy(ifname,ptr);
-	else {
-		homedir = getenv("HOME");
-		if ( !homedir ) {
-			char rootname[BUFSIZ];
-
-			get_rootdir(rootname,sizeof(rootname));
-			homedir = rootname;
-		}
-		sprintf(ifname,"%s/.asirrc",homedir);
-	}
-
 	/* the bottom of the input stack */
 	input_init(0,"string");
 
-	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		fclose(ifp);
+	if ( do_asirrc && (ifname = find_asirrc()) ) {
 		do_server_sav = do_server_in_X11;
 		do_server_in_X11 = 0;
 		if ( !SETJMP(main_env) )
@@ -1046,7 +1021,7 @@ void ox_io_init() {
 
 	I_am_server = 1;
 	endian_init();
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	if ( !ox_sock_id )
 		exit(0);
 	iofp[0].in = WSIO_open(ox_sock_id,"r");
@@ -1059,7 +1034,7 @@ void ox_io_init() {
 	setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ);
 	setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ);
 #endif
-	signal(SIGUSR1,ox_usr1_handler);
+	set_signal(SIGUSR1,ox_usr1_handler);
 #endif
 	asir_OperandStackSize = BUFSIZ;
 	asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));
@@ -1076,7 +1051,7 @@ void ox_io_init() {
 	register_server(0,0,0,-1);
 }
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 /*
  * Library mode functions
  */
@@ -1238,22 +1213,22 @@ int asir_ox_peek_cmo_string_length()
 int asir_ox_init(int byteorder)
 {
 	int tmp;
-	char ifname[BUFSIZ];
+	char *ifname;
 	extern int GC_dont_gc;
 	extern int do_asirrc;
 	extern int do_server_in_X11;
-	char *getenv();
 	static ox_asir_initialized = 0;
-	FILE *ifp;
 
 	GC_init();
-#if !defined(VISUAL) && !defined(MPI)
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(MPI)
 	do_server_in_X11 = 0; /* XXX */
 #endif
 	asir_save_handler();
+#if 0
 #if defined(PARI)
 	risa_pari_init();
 #endif
+#endif
 	srandom((int)get_current_time());
 
 	rtime_init();
@@ -1270,16 +1245,14 @@ int asir_ox_init(int byteorder)
 	pf_init();
 	sysf_init();
 	parif_init();
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	init_socket();
 #endif
 #if defined(UINIT)
 	reg_sysf();
 #endif
 	input_init(0,"string");
-	sprintf(ifname,"%s/.asirrc",getenv("HOME"));
-	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		fclose(ifp);
+	if ( do_asirrc && (ifname = find_asirrc()) ) {
 		if ( !SETJMP(main_env) )
 			execasirfile(ifname);
 	}