===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.80
retrieving revision 1.93
diff -u -p -r1.80 -r1.93
--- OpenXM_contrib2/asir2000/parse/glob.c	2011/06/16 08:17:15	1.80
+++ OpenXM_contrib2/asir2000/parse/glob.c	2016/08/24 08:21:03	1.93
@@ -45,20 +45,18 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.79 2010/08/03 04:34:44 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.92 2016/08/24 05:33:58 ohara Exp $ 
 */
 #include "ca.h"
 #include "al.h"
 #include "parse.h"
 #include "ox.h"
-#if defined(PARI)
-#include "genpari.h"
-#endif
-#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__)
+#include <signal.h>
+#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__)
 #include <sgtty.h>
 #endif
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <io.h>
 #include <direct.h>
 #else
@@ -71,7 +69,7 @@
 #include <sys/ttold.h>
 #endif
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #define HISTORY asir_history
 #endif
 
@@ -84,6 +82,7 @@ JMP_BUF main_env,debug_env,timer_env,exec_env;
 int little_endian,debug_mode,no_debug_on_error;
 char *asir_libdir;
 char *asir_contrib_dir;
+char *asir_private_dir;
 char *asir_pager;
 
 NODE usrf,sysf,noargsysf,ubinf,parif;
@@ -145,7 +144,7 @@ struct oF oF_TRUE,oF_FALSE;
 F F_TRUE = &oF_TRUE;  
 F F_FALSE = &oF_FALSE;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp ";
 #else
 char cppname[BUFSIZ] = "/lib/cpp ";
@@ -227,12 +226,20 @@ void asir_terminate(int status)
 		LONGJMP(asir_infile->jmpbuf,status);
 	else {
 		if ( user_quit_handler ) {
-			if ( !do_terse )
+			if ( !do_terse ) {
 				fprintf(stderr,"Calling the registered quit callbacks...");
+#if defined(__MINGW32__)
+				fflush(stderr);
+#endif
+			}
 			for ( n = user_quit_handler; n; n = NEXT(n) )
 				bevalf((FUNC)BDY(n),0);
-			if ( !do_terse )
+			if ( !do_terse ) {
 				fprintf(stderr, "done.\n");
+#if defined(__MINGW32__)
+				fflush(stderr);
+#endif
+			}
 		}
 		tty_reset();
 #if defined(MPI)
@@ -241,7 +248,7 @@ void asir_terminate(int status)
 		mpi_finalize();
 #else
 #if defined(SIGPIPE)
-		signal(SIGPIPE,SIG_IGN);
+		set_signal(SIGPIPE,SIG_IGN);
 #endif
 		close_allconnections();
 #endif
@@ -284,7 +291,7 @@ void sprompt(char *ptr)
 	sprintf(ptr,"[%d] ",APVS->n);
 }
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 static int which(char *prog, char *path, char *buf, size_t size)
 {
     char *tok;
@@ -317,7 +324,7 @@ static int which(char *prog, char *path, char *buf, si
 
 void cppname_init()
 {
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	char *oxhome;
 	char oxcpp[BUFSIZ];
 #define OXCPP "/bin/ox_cpp"
@@ -372,6 +379,9 @@ void process_args(int ac,char **av)
 			in_fp = fopen(*(av+1),"r");
 			if ( !in_fp ) {
 				fprintf(stderr,"%s does not exist!\n",*(av+1));
+#if defined(__MINGW32__)
+				fflush(stderr);
+#endif
 				asir_terminate(1);
 			}
 			do_file = 1;
@@ -391,7 +401,7 @@ void process_args(int ac,char **av)
 			void GC_set_max_heap_size(int);
 
 			GC_set_max_heap_size(atoi(*(av+1))); av += 2; ac -= 2;
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 		} else if ( !strcmp(*av,"-display") && (ac >= 2) ) {
 			strcpy(displayname,*(av+1)); av += 2; ac -= 2;
 #endif
@@ -399,14 +409,11 @@ void process_args(int ac,char **av)
 		} else if ( !strcmp(*av,"-fep") ) {
 			do_fep = 1; av++; ac--;
 #endif
-#if defined(PARI)
-		} else if ( !strcmp(*av,"-paristack") ) {
-			extern int paristack;
-
-			paristack = atoi(*(av+1)); av += 2; ac -= 2;
-#endif
 		} else {
 			fprintf(stderr,"%s : unknown option.\n",*av);
+#if defined(__MINGW32__)
+			fflush(stderr);
+#endif
 			asir_terminate(1);
 		}
 	}
@@ -423,48 +430,63 @@ void process_args(int ac,char **av)
 #endif
 }
 
-#include <signal.h>
+#if defined(HAVE_SIGACTION)
+void (*set_signal(int sig, void (*handler)(int)))(int)
+{
+	struct sigaction act;
+	struct sigaction oldact;
+	if (handler == SIG_IGN || handler == SIG_DFL) {
+		return signal(sig,handler);
+	}
+	act.sa_handler=handler;
+	act.sa_flags=0;
+	act.sa_flags |= SA_RESTART;
+	sigemptyset(&act.sa_mask);
+	sigaction(sig,&act,&oldact);
+	return oldact.sa_handler;
+}
+#endif
 
 void sig_init() {
-#if !defined(VISUAL)
-	signal(SIGINT,int_handler);
+#if !defined(VISUAL) && !defined(__MINGW32__)
+	set_signal(SIGINT,int_handler);
 #else
 	void register_ctrlc_handler();
 
 	register_ctrlc_handler();
 #endif
-	signal(SIGSEGV,segv_handler);
+	set_signal(SIGSEGV,segv_handler);
 
 #if defined(SIGFPE)
-	signal(SIGFPE,fpe_handler);
+	set_signal(SIGFPE,fpe_handler);
 #endif
 
 #if defined(SIGPIPE)
-	signal(SIGPIPE,pipe_handler);
+	set_signal(SIGPIPE,pipe_handler);
 #endif
 
 #if defined(SIGILL)
-	signal(SIGILL,ill_handler);
+	set_signal(SIGILL,ill_handler);
 #endif
 
-#if !defined(VISUAL)
-	signal(SIGBUS,bus_handler);
+#if !defined(VISUAL) && !defined(__MINGW32__)
+	set_signal(SIGBUS,bus_handler);
 #endif
 }
 
 static void (*old_int)(int);
 
 void asir_save_handler() {
-	old_int = signal(SIGINT,SIG_IGN);
-	signal(SIGINT,old_int);
+	old_int = set_signal(SIGINT,SIG_IGN);
+	set_signal(SIGINT,old_int);
 }
 
 void asir_set_handler() {
-	signal(SIGINT,int_handler);
+	set_signal(SIGINT,int_handler);
 }
 
 void asir_reset_handler() {
-	signal(SIGINT,old_int);
+	set_signal(SIGINT,old_int);
 }
 
 extern int I_am_server;
@@ -477,21 +499,21 @@ void resetenv(char *s)
 	while ( NEXT(asir_infile) )
 		closecurrentinput();
 	resetpvs();
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	if ( do_server_in_X11 )
 #endif
 		show_debug_window(0);
 #if defined(VISUAL_LIB)
 	w_noflush_stderr(0);
 #endif
-	asir_out = stdout;
-#if defined(PARI)
-	pari_outfile = stdout;
+#if defined(__MINGW32__)
+	fflush(stderr);
 #endif
+	asir_out = stdout;
 	/* restore states */
 	reset_engine();
 	reset_io();
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	reset_timer();
 #endif
 	LONGJMP(main_env,1);
@@ -503,6 +525,8 @@ void fatal(int n)
 }
 
 extern int ox_int_received, critical_when_signal;
+extern int in_gc, caught_intr;
+extern int ox_get_pari_result;
 
 void int_handler(int sig)
 {
@@ -513,15 +537,19 @@ void int_handler(int sig)
 	if ( do_file ) {
 		ExitAsir();
 	}
-	if ( critical_when_signal ) {
+	if ( !ox_get_pari_result && critical_when_signal ) {
 		ox_int_received = 1;
 		return;
 	}
-#if defined(VISUAL)
+	if ( in_gc ) {
+		caught_intr = 1;
+		return;
+	}
+#if defined(VISUAL) || defined(__MINGW32__)
 	suspend_timer();
 #endif
-	signal(SIGINT,SIG_IGN);
-#if !defined(VISUAL) 
+	set_signal(SIGINT,SIG_IGN);
+#if !defined(VISUAL) && !defined(__MINGW32__) 
     if ( do_server_in_X11 ) {
 		debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0);
  		restore_handler();
@@ -555,6 +583,9 @@ void int_handler(int sig)
 					fgets(buf,BUFSIZ,stdin);
 					if ( !strncmp(buf,"y",1) ) {
 						fprintf(stderr,"Bye\n");
+#if defined(__MINGW32__)
+						fflush(stderr);
+#endif
 						/* for terminating myself */
 						asir_infile = 0;
 						asir_terminate(1);
@@ -581,13 +612,21 @@ void int_handler(int sig)
 				restore_handler();
 				if ( c == 'u' ) {
 					if ( user_int_handler ) {
-						if ( !do_terse )
+						if ( !do_terse ) {
 							fprintf(stderr,
 								"Calling the registered exception callbacks...");
+#if defined(__MINGW32__)
+							fflush(stderr);
+#endif
+						}
 						for ( t = user_int_handler; t; t = NEXT(t) )
 							bevalf((FUNC)BDY(t),0);
-						if ( !do_terse )
+						if ( !do_terse ) {
 							fprintf(stderr, "done.\n");
+#if defined(__MINGW32__)
+							fflush(stderr);
+#endif
+						}
 					}
 				}
 				resetenv("return to toplevel");
@@ -607,6 +646,9 @@ void int_handler(int sig)
 				break;
 			case '?': 
 				fprintf(stderr, "q:quit t:toplevel c:continue d:debug u:call registered handler w:where\n");
+#if defined(__MINGW32__)
+				fflush(stderr);
+#endif
 				break;
 			default:
 				break;
@@ -615,18 +657,18 @@ void int_handler(int sig)
 }
 
 void restore_handler() {
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	resume_timer();
 #endif
 #if defined(SIGINT)
-	signal(SIGINT,int_handler);
+	set_signal(SIGINT,int_handler);
 #endif
 }
 
 void segv_handler(int sig)
 {
 #if defined(SIGSEGV)
-	signal(SIGSEGV,segv_handler);
+	set_signal_for_restart(SIGSEGV,segv_handler);
 	error("internal error (SEGV)");
 #endif
 }
@@ -634,7 +676,7 @@ void segv_handler(int sig)
 void ill_handler(int sig)
 {
 #if defined(SIGILL)
-	signal(SIGILL,ill_handler);
+	set_signal_for_restart(SIGILL,ill_handler);
 	error("illegal instruction (ILL)");
 #endif
 }
@@ -650,13 +692,16 @@ void ill_handler(int sig)
 void alrm_handler(int sig)
 {
 	fprintf(stderr,"interval timer expired (VTALRM)\n");
+#if defined(__MINGW32__)
+	fflush(stderr);
+#endif
 	LONGJMP(timer_env,1);
 }
 
 void bus_handler(int sig)
 {
 #if defined(SIGBUS)
-	signal(SIGBUS,bus_handler);
+	set_signal_for_restart(SIGBUS,bus_handler);
 	error("internal error (BUS ERROR)");
 #endif
 }
@@ -664,7 +709,7 @@ void bus_handler(int sig)
 void fpe_handler(int sig)
 {
 #if defined(SIGFPE)
-	signal(SIGFPE,fpe_handler);
+	set_signal_for_restart(SIGFPE,fpe_handler);
 	error("internal error (FPE)");
 #endif
 }
@@ -672,7 +717,7 @@ void fpe_handler(int sig)
 void pipe_handler(int sig)
 {
 #if defined(SIGPIPE)
-	signal(SIGPIPE,pipe_handler);
+	set_signal_for_restart(SIGPIPE,pipe_handler);
 	end_critical();
 	error("internal error (BROKEN PIPE)");
 #endif
@@ -703,11 +748,14 @@ void error(char *s)
 {
 	SNODE *snp=0;
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	if ( !error_in_timer && timer_is_set )
 		alrm_handler(SIGNAL_FOR_TIMER);
 #endif
 	fprintf(stderr,"%s\n",s);
+#if defined(__MINGW32__)
+	fflush(stderr);
+#endif
 	set_lasterror(s);
 	if ( CPVS != GPVS ) {
 		if ( CPVS && CPVS->usrf && CPVS->usrf->f.usrf )
@@ -736,15 +784,18 @@ void error(char *s)
 	resetenv("return to toplevel");
 }
 
-void toplevel(char *s)
+void goto_toplevel(char *s)
 {
 	SNODE *snp=0;
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 	if ( timer_is_set )
 		alrm_handler(SIGNAL_FOR_TIMER);
 #endif
 	fprintf(stderr,"%s\n",s);
+#if defined(__MINGW32__)
+	fflush(stderr);
+#endif
 	if ( do_file ) {
 		char errbuf[BUFSIZ*5]; /* sufficient to store stack information ? */
 
@@ -755,7 +806,7 @@ void toplevel(char *s)
 	resetenv("return to toplevel");
 }
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
 #include <sys/time.h>
 
 void set_timer(int interval)
@@ -767,7 +818,7 @@ void set_timer(int interval)
 	it.it_value.tv_sec = interval;
 	it.it_value.tv_usec = 0;
 	setitimer(ITIMER_TYPE,&it,0);
-	signal(SIGNAL_FOR_TIMER,alrm_handler);
+	set_signal(SIGNAL_FOR_TIMER,alrm_handler);
 	timer_is_set = 1;
 }
 
@@ -780,7 +831,7 @@ void reset_timer()
 	it.it_value.tv_sec = 0;
 	it.it_value.tv_usec = 0;
 	setitimer(ITIMER_TYPE,&it,0);
-	signal(SIGNAL_FOR_TIMER,SIG_IGN);
+	set_signal(SIGNAL_FOR_TIMER,SIG_IGN);
 	timer_is_set = 0;
 }
 #endif
@@ -790,22 +841,11 @@ char *get_asir_distribution();
 
 char *get_gcversion() 
 {
-#if defined(GC7)
-	return "GC 7.1 copyright 1988-2008, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
-#else
-	return "GC 6.8 copyright 1988-2006, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
-#endif
+	return "GC 7.2 copyright 1988-2012, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
 }
 
 char *get_pariversion() 
 {
-#if PARI
-#if 0
-	return PARIVERSION", Copyright (C) 2000-2005 The PARI Group.\n";
-#else
-	return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
-#endif
-#endif
 	return "";
 }
 
@@ -842,3 +882,19 @@ char *scopyright()
 	}
 	return notice;
 }
+
+#if defined(VISUAL) || defined(__MINGW32__)
+void check_intr()
+{
+	extern int recv_intr;
+	if ( recv_intr ) {
+		if ( recv_intr == 1 ) {
+			recv_intr = 0;
+			int_handler(SIGINT);
+		} else {
+			recv_intr = 0;
+			ox_usr1_handler(0);
+		}
+	}
+}
+#endif