===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.14
retrieving revision 1.20
diff -u -p -r1.14 -r1.20
--- OpenXM_contrib2/asir2000/parse/glob.c	2001/03/08 07:49:13	1.14
+++ OpenXM_contrib2/asir2000/parse/glob.c	2001/06/27 09:14:08	1.20
@@ -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.13 2000/12/22 10:03:31 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.19 2001/06/15 07:56:06 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -62,7 +62,7 @@
 #include <direct.h>
 #endif
 
-#if defined(SYSV)
+#if defined(SYSV) && !defined(_IBMR2)
 #include <sys/ttold.h>
 #endif
 
@@ -94,7 +94,9 @@ FILE *ox_istream,*ox_ostream;
 int do_server_in_X11;
 Obj LastVal;
 char LastError[BUFSIZ];
+int timer_is_set;
 
+
 struct oV oVAR[] = {
 	{"x",0,0}, {"y",0,0}, {"z",0,0}, {"u",0,0},
 	{"v",0,0}, {"w",0,0}, {"p",0,0}, {"q",0,0},
@@ -130,7 +132,7 @@ F F_FALSE = &oF_FALSE;
 #if defined(__SVR4) && defined(sun)
 char cppname[BUFSIZ] = "/usr/ccs/lib/cpp ";
 #else
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__MACH__) && defined(__ppc__))
 char cppname[BUFSIZ] = "/usr/bin/cpp ";
 #else
 #if defined(VISUAL)
@@ -213,6 +215,9 @@ int status;
 			close_allconnections();
 		mpi_finalize();
 #else
+#if defined(SIGPIPE)
+		signal(SIGPIPE,SIG_IGN);
+#endif
 		close_allconnections();
 #endif
 		if ( kernelmode )
@@ -396,6 +401,9 @@ char *s;
 	/* restore states */
 	reset_engine();
 	reset_io();
+#if !defined(VISUAL)
+	reset_timer();
+#endif
 	longjmp(env,1);
 }
 
@@ -421,11 +429,9 @@ int sig;
 		return;
 	}
 #if defined(VISUAL)
-	suspend_timer(); signal(SIGINT,SIG_IGN);
+	suspend_timer();
 #endif
-#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__)
 	signal(SIGINT,SIG_IGN);
-#endif
 #if !defined(VISUAL) 
     if ( do_server_in_X11 ) {
 		debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0);
@@ -521,9 +527,9 @@ int sig;
 
 void restore_handler() {
 #if defined(VISUAL)
-	resume_timer(); signal(SIGINT,int_handler);
+	resume_timer();
 #endif
-#if defined(_PA_RISC1_1) || defined(linux) || defined(__svr4__)
+#if defined(SIGINT)
 	signal(SIGINT,int_handler);
 #endif
 }
@@ -531,19 +537,19 @@ void restore_handler() {
 void segv_handler(sig)
 int sig;
 {
-#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__)
+#if defined(SIGSEGV)
 	signal(SIGSEGV,segv_handler);
-#endif
 	error("internal error (SEGV)");
+#endif
 }
 
 void ill_handler(sig)
 int sig;
 {
-#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__)
+#if defined(SIGILL)
 	signal(SIGILL,ill_handler);
-#endif
 	error("illegal instruction (ILL)");
+#endif
 }
 
 void alrm_handler(sig)
@@ -565,10 +571,10 @@ int sig;
 void fpe_handler(sig)
 int sig;
 {
-#if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__)
+#if defined(SIGFPE)
 	signal(SIGFPE,fpe_handler);
-#endif
 	error("internal error (FPE)");
+#endif
 }
 
 void pipe_handler(sig)
@@ -576,6 +582,7 @@ int sig;
 {
 #if defined(SIGPIPE)
 	signal(SIGPIPE,pipe_handler);
+	end_critical();
 	error("internal error (BROKEN PIPE)");
 #endif
 }
@@ -606,6 +613,10 @@ char *s;
 {
 	SNODE *snp;
 
+#if !defined(VISUAL)
+	if ( timer_is_set )
+		alrm_handler(SIGVTALRM);
+#endif
 	fprintf(stderr,"%s\n",s);
 	set_lasterror(s);
 	if ( CPVS != GPVS ) {
@@ -649,6 +660,7 @@ int interval;
 	it.it_value.tv_usec = 0;
 	setitimer(ITIMER_VIRTUAL,&it,0);
 	signal(SIGVTALRM,alrm_handler);
+	timer_is_set = 1;
 }
 
 void reset_timer()
@@ -661,6 +673,7 @@ void reset_timer()
 	it.it_value.tv_usec = 0;
 	setitimer(ITIMER_VIRTUAL,&it,0);
 	signal(SIGVTALRM,SIG_IGN);
+	timer_is_set = 0;
 }
 #endif
 
@@ -668,8 +681,13 @@ unsigned int get_asir_version();
 char *get_asir_distribution();
 
 void copyright() {
+#if defined(INTERVAL)
+	printf("This is Risa/Asir + Interval Arithmetic, Version %d (%s Distribution).\n",
+		get_asir_version(), get_asir_distribution());
+#else
 	printf("This is Risa/Asir, Version %d (%s Distribution).\n",
 		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");