===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.24
retrieving revision 1.31
diff -u -p -r1.24 -r1.31
--- OpenXM_contrib2/asir2000/parse/glob.c	2001/10/09 01:36:24	1.24
+++ OpenXM_contrib2/asir2000/parse/glob.c	2003/02/14 22:29:18	1.31
@@ -45,16 +45,16 @@
  * 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.23 2001/10/05 10:23:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.30 2003/01/06 01:16:40 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
 #include "parse.h"
 #include "ox.h"
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
-#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV)
+#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__)
 #include <sgtty.h>
 #endif
 
@@ -78,14 +78,14 @@ extern int GC_free_space_numerator;
 extern FILE *asir_out;
 
 INFILE asir_infile;
-jmp_buf main_env,debug_env,timer_env,exec_env;
+JMP_BUF main_env,debug_env,timer_env,exec_env;
 int little_endian,debug_mode;
 char *asir_libdir;
 char *asir_pager;
 
 NODE usrf,sysf,noargsysf,ubinf,parif;
 NODE ONENODE;
-int main_parser, ox_do_copy, ox_do_count, ox_count_length;
+int main_parser, allow_create_var, ox_do_copy, ox_do_count, ox_count_length;
 int ox_file_io, ox_need_conv;
 char *ox_copy_bptr;
 char *parse_strp;
@@ -133,7 +133,7 @@ F F_FALSE = &oF_FALSE;
 #if defined(__SVR4) && defined(sun)
 char cppname[BUFSIZ] = "/usr/ccs/lib/cpp ";
 #else
-#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__))
+#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__)
 char cppname[BUFSIZ] = "/usr/bin/cpp ";
 #else
 #if defined(VISUAL)
@@ -206,12 +206,12 @@ void asir_terminate(int status)
 		t = read_exec_file;
 		read_exec_file = 0;
 		if ( t == 1 )
-			longjmp(main_env,status);
+			LONGJMP(main_env,status);
 		else
-			longjmp(exec_env,status);
+			LONGJMP(exec_env,status);
 	} else {
 		tty_reset();
-#if MPI
+#if defined(MPI)
 		if ( !mpi_myid )
 			close_allconnections();
 		mpi_finalize();
@@ -223,7 +223,7 @@ void asir_terminate(int status)
 #endif
 		if ( asir_out )
 			fflush(asir_out);
-#if FEP
+#if defined(FEP)
 		if ( do_fep ) {
 			stifle_history(MAXHIST);
 			write_history(asir_history);
@@ -258,7 +258,7 @@ FILE *in_fp;
 void process_args(int ac,char **av)
 {
 	do_asirrc = 1;
-#if !MPI
+#if !defined(MPI)
 	do_message = 1;
 #endif
 	while ( ac > 0 ) {
@@ -302,11 +302,11 @@ void process_args(int ac,char **av)
 		} else if ( !strcmp(*av,"-display") && (ac >= 2) ) {
 			strcpy(displayname,*(av+1)); av += 2; ac -= 2;
 #endif
-#if FEP
+#if defined(FEP)
 		} else if ( !strcmp(*av,"-fep") ) {
 			do_fep = 1; av++; ac--;
 #endif
-#if PARI
+#if defined(PARI)
 		} else if ( !strcmp(*av,"-paristack") ) {
 			extern int paristack;
 
@@ -317,7 +317,7 @@ void process_args(int ac,char **av)
 			asir_terminate(1);
 		}
 	}
-#if FEP
+#if defined(FEP)
 	if ( do_fep ) {
 		char *home;
 		home = (char *)getenv("HOME");
@@ -390,7 +390,7 @@ void resetenv(char *s)
 	w_noflush_stderr(0);
 #endif
 	asir_out = stdout;
-#if PARI
+#if defined(PARI)
 	pari_outfile = stdout;
 #endif
 	/* restore states */
@@ -399,7 +399,7 @@ void resetenv(char *s)
 #if !defined(VISUAL)
 	reset_timer();
 #endif
-	longjmp(main_env,1);
+	LONGJMP(main_env,1);
 }
 
 void fatal(int n)
@@ -540,7 +540,7 @@ void ill_handler(int sig)
 void alrm_handler(int sig)
 {
 	fprintf(stderr,"interval timer expired (VTALRM)\n");
-	longjmp(timer_env,1);
+	LONGJMP(timer_env,1);
 }
 
 void bus_handler(int sig)
@@ -616,7 +616,7 @@ void error(char *s)
 		ExitAsir();
 	}
 	if ( debug_mode )
-		longjmp(debug_env,1);
+		LONGJMP(debug_env,1);
 	if ( CPVS != GPVS )
 		if ( do_server_in_X11 || isatty(0) )
 			bp(error_snode);
@@ -667,10 +667,9 @@ void copyright() {
 		get_asir_version(), get_asir_distribution());
 #endif
 	printf("Copyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\n");
-	printf("Copyright 2000,2001, Risa/Asir committers, http://www.openxm.org/.\n");
-	printf("GC 5.3, copyright 1999, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");
-	printf("PARI 2.2.1(alpha), copyright (C) 2000,\n");
-	printf("     C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier.\n");
+	printf("Copyright 2000-2003, Risa/Asir committers, http://www.openxm.org/.\n");
+	printf("GC 6.1(alpha5) copyright 2001, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");
+	printf("PARI 2.2.4, copyright (C) 2002 The PARI Group.\n");
 }