===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.78
retrieving revision 1.87
diff -u -p -r1.78 -r1.87
--- OpenXM_contrib2/asir2000/parse/glob.c	2010/08/01 08:44:15	1.78
+++ OpenXM_contrib2/asir2000/parse/glob.c	2015/08/04 06:20:45	1.87
@@ -45,15 +45,12 @@
  * 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.77 2010/05/26 06:32:49 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.86 2015/03/16 00:08:32 noro 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 <sgtty.h>
 #endif
@@ -84,6 +81,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;
@@ -167,7 +165,7 @@ void glob_init() {
 	reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
 	reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV));
 	CPVS = GPVS;
-	MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),0);
+	MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),NULLP);
 	OID(F_TRUE)=O_F; FOP(F_TRUE)=AL_TRUE; F_TRUE->arg.dummy = 0;
 	OID(F_FALSE)=O_F; FOP(F_FALSE)=AL_FALSE; F_FALSE->arg.dummy = 0;
 	OID(Symbol_grlex) = O_SYMBOL; Symbol_grlex->name = "@grlex"; 
@@ -318,10 +316,20 @@ static int which(char *prog, char *path, char *buf, si
 void cppname_init()
 {
 #if !defined(VISUAL)
-    char oxcpp[BUFSIZ];
-    if(which("ox_cpp", getenv("PATH"), oxcpp, BUFSIZ) && access(oxcpp, X_OK&R_OK) == 0) {
-        strncpy(cppname,oxcpp,BUFSIZ-1);
-    }else if (access(cppname, X_OK&R_OK) != 0) {
+	char *oxhome;
+	char oxcpp[BUFSIZ];
+#define OXCPP "/bin/ox_cpp"
+
+	if ( oxhome = getenv("OpenXM_HOME") ) {
+		if ( strlen(oxhome)+strlen(OXCPP)<BUFSIZ ) {
+			sprintf(oxcpp,"%s%s",oxhome,OXCPP);
+			if ( access(oxcpp,X_OK&R_OK) == 0 ) {
+        		strcpy(cppname,oxcpp);
+				return;
+			}
+		}
+	}
+    if (access(cppname, X_OK&R_OK) != 0) {
         which("cpp", "/lib:/usr/ccs/lib:/usr/bin", cppname, BUFSIZ) ||
         which("cpp", getenv("PATH"), cppname, BUFSIZ);
     }
@@ -389,12 +397,6 @@ 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);
 			asir_terminate(1);
@@ -475,9 +477,6 @@ void resetenv(char *s)
 	w_noflush_stderr(0);
 #endif
 	asir_out = stdout;
-#if defined(PARI)
-	pari_outfile = stdout;
-#endif
 	/* restore states */
 	reset_engine();
 	reset_io();
@@ -493,6 +492,7 @@ void fatal(int n)
 }
 
 extern int ox_int_received, critical_when_signal;
+extern int in_gc, caught_intr;
 
 void int_handler(int sig)
 {
@@ -507,6 +507,10 @@ void int_handler(int sig)
 		ox_int_received = 1;
 		return;
 	}
+	if ( in_gc ) {
+		caught_intr = 1;
+		return;
+	}
 #if defined(VISUAL)
 	suspend_timer();
 #endif
@@ -726,7 +730,7 @@ void error(char *s)
 	resetenv("return to toplevel");
 }
 
-void toplevel(char *s)
+void goto_toplevel(char *s)
 {
 	SNODE *snp=0;
 
@@ -780,22 +784,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 "";
 }
 
@@ -832,3 +825,19 @@ char *scopyright()
 	}
 	return notice;
 }
+
+#if defined(VISUAL)
+void check_intr()
+{
+	extern int recv_intr;
+	if ( recv_intr ) {
+		if ( recv_intr == 1 ) {
+			recv_intr = 0;
+			int_handler(0);
+		} else {
+			recv_intr = 0;
+			ox_usr1_handler(0);
+		}
+	}
+}
+#endif