===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.71
retrieving revision 1.80
diff -u -p -r1.71 -r1.80
--- OpenXM_contrib2/asir2000/parse/glob.c	2007/09/19 05:56:01	1.71
+++ OpenXM_contrib2/asir2000/parse/glob.c	2011/06/16 08:17:15	1.80
@@ -45,7 +45,7 @@
  * 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.70 2007/09/19 05:43:00 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.79 2010/08/03 04:34:44 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -54,7 +54,7 @@
 #if defined(PARI)
 #include "genpari.h"
 #endif
-#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX)
+#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__)
 #include <sgtty.h>
 #endif
 
@@ -77,8 +77,6 @@
 
 #define MAXHIST 100
 
-extern int GC_free_space_divisor;
-extern int GC_free_space_numerator;
 extern FILE *asir_out;
 
 INFILE asir_infile;
@@ -169,7 +167,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"; 
@@ -320,6 +318,19 @@ static int which(char *prog, char *path, char *buf, si
 void cppname_init()
 {
 #if !defined(VISUAL)
+	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);
@@ -331,6 +342,7 @@ FILE *in_fp;
 
 void process_args(int ac,char **av)
 {
+	int nm,dv;
 	do_asirrc = 1;
 #if !defined(MPI)
 	do_message = 1;
@@ -343,13 +355,15 @@ void process_args(int ac,char **av)
 			GC_expand_hp(atoi(*(av+1))); av += 2; ac -= 2;
 		} else if ( !strcmp(*av,"-adj") && (ac >= 2) ) {
 			char *slash;
-
 			slash = strrchr(*(av+1),'/');
 			if ( slash ) {
 				*slash = 0;
-				GC_free_space_numerator = atoi(slash+1);
+				nm = atoi(slash+1);
+			}else {
+				nm = 1;
 			}
-			GC_free_space_divisor = atoi(*(av+1));
+			dv = atoi(*(av+1));
+			Risa_GC_set_adj(nm,dv);
 			av += 2; ac -= 2;
 		} else if ( !strcmp(*av,"-cpp") && (ac >= 2) ) {
 			strcpy(cppname,*(av+1)); av += 2; ac -= 2;
@@ -528,8 +542,12 @@ void int_handler(int sig)
 
 		fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr);
 		buf[0] = '\n';
-		while ( buf[0] == '\n' )
+		while ( !feof(stdin) && buf[0] == '\n' )
 			fgets(buf,BUFSIZ,stdin);
+		if ( feof(stdin) ) {
+			clearerr(stdin);
+			continue;
+		}
 		switch ( c = buf[0] ) {
 			case 'q':
 				while ( 1 ) {
@@ -770,6 +788,15 @@ void reset_timer()
 unsigned int get_asir_version();
 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
+}
+
 char *get_pariversion() 
 {
 #if PARI
@@ -793,24 +820,25 @@ char *get_intervalversion()
 
 void copyright()
 {
-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 Copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
-	printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());
+	char *scopyright();
+	fputs(scopyright(), stdout);
 }
 
 char *scopyright()
 {
 	static char *notice;
-	char *s1, *s2, *s3;
+	char *s1, *s2, *s3, *s4;
 	int d, len;
-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\n%s%s";
 	if (!notice) {
 		s1 = get_intervalversion();
 		s2 = get_asir_distribution();
-		s3 = get_pariversion();
+		s3 = get_gcversion();
+		s4 = get_pariversion();
 		d  = get_asir_version();
-		len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+sizeof(int)*3;
+		len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+strlen(s4)+sizeof(int)*3;
 		notice = MALLOC(len+1);
-		sprintf(notice, format, s1, d, s2, s3);
+		sprintf(notice, format, s1, d, s2, s3, s4);
 	}
 	return notice;
 }