===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.18
retrieving revision 1.23
diff -u -p -r1.18 -r1.23
--- OpenXM_contrib2/asir2000/parse/glob.c	2001/06/04 02:49:48	1.18
+++ OpenXM_contrib2/asir2000/parse/glob.c	2001/10/05 10:23:07	1.23
@@ -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.17 2001/03/19 01:26:36 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.22 2001/09/05 01:20:19 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
 
@@ -77,7 +77,7 @@ extern int GC_free_space_numerator;
 extern FILE *asir_out;
 
 IN asir_infile;
-jmp_buf env,debug_env,timer_env;
+jmp_buf main_env,debug_env,timer_env,exec_env;
 int little_endian,debug_mode;
 char *asir_libdir;
 char *asir_pager;
@@ -176,11 +176,9 @@ void notdef(vl,a,b,c)
 VL vl;
 Obj a,b,*c;
 {
-	*c = 0;
 	error("undefined arithmetic operation.");
 }
 
-int kernelmode;
 int do_asirrc;
 int do_file;
 int do_message;
@@ -206,8 +204,15 @@ void ExitAsir() {
 void asir_terminate(status)
 int status;
 {
+	int t;
+
 	if ( read_exec_file ) {
-		read_exec_file = 0; longjmp(env,status);
+		t = read_exec_file;
+		read_exec_file = 0;
+		if ( t == 1 )
+			longjmp(main_env,status);
+		else
+			longjmp(exec_env,status);
 	} else {
 		tty_reset();
 #if MPI
@@ -215,10 +220,11 @@ int status;
 			close_allconnections();
 		mpi_finalize();
 #else
+#if defined(SIGPIPE)
+		signal(SIGPIPE,SIG_IGN);
+#endif
 		close_allconnections();
 #endif
-		if ( kernelmode )
-			fputc(0xff,asir_out);
 		if ( asir_out )
 			fflush(asir_out);
 #if FEP
@@ -242,14 +248,14 @@ void param_init() {
 	
 void prompt() {
 	if ( !no_prompt && !do_fep && asir_infile->fp == stdin )
-		fprintf(asir_out,"[%d]%c",APVS->n,kernelmode?0xfe:' ');
+		fprintf(asir_out,"[%d] ",APVS->n);
 	fflush(asir_out);
 }
 
 void sprompt(ptr)
 char *ptr;
 {
-	sprintf(ptr,"[%d]%c",APVS->n,kernelmode?0xfe:' ');
+	sprintf(ptr,"[%d] ",APVS->n);
 }
 
 FILE *in_fp;
@@ -287,8 +293,6 @@ char **av;
 			}
 			do_file = 1;
 			av += 2; ac -= 2;
-		} else if ( !strcmp(*av,"-kernel") ) {
-			kernelmode = 1; av++; ac--;
 		} else if ( !strcmp(*av,"-norc") ) {
 			do_asirrc = 0; av++; ac--;
 		} else if ( !strcmp(*av,"-nomessage") ) {
@@ -343,15 +347,15 @@ void sig_init() {
 #endif
 	signal(SIGSEGV,segv_handler);
 
-#if defined SIGFPE
+#if defined(SIGFPE)
 	signal(SIGFPE,fpe_handler);
 #endif
 
-#if defined SIGPIPE
+#if defined(SIGPIPE)
 	signal(SIGPIPE,pipe_handler);
 #endif
 
-#if defined SIGILL
+#if defined(SIGILL)
 	signal(SIGILL,ill_handler);
 #endif
 
@@ -401,7 +405,7 @@ char *s;
 #if !defined(VISUAL)
 	reset_timer();
 #endif
-	longjmp(env,1);
+	longjmp(main_env,1);
 }
 
 void fatal(n)
@@ -426,11 +430,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);
@@ -451,8 +453,6 @@ int sig;
 		char c;
 
 		fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr);
-		if ( kernelmode )
-			fputc('\0',stderr);
 		buf[0] = '\n';
 		while ( buf[0] == '\n' )
 			fgets(buf,BUFSIZ,stdin);
@@ -484,8 +484,6 @@ int sig;
 				}
 				if ( debug_mode )
 					debug_mode = 0;
-				if ( kernelmode )
-					fputc('\0',stderr);
 				restore_handler();
 				if ( c == 'u' ) {
 					if ( registered_handler ) {
@@ -509,8 +507,6 @@ int sig;
  				restore_handler();
  				return;
 			case 'c': 
-				if ( kernelmode )
-					fputc('\0',stderr);
 				restore_handler();
 				return; break;
 			case 'w':
@@ -526,9 +522,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
 }
@@ -536,19 +532,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)
@@ -570,10 +566,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)
@@ -581,6 +577,7 @@ int sig;
 {
 #if defined(SIGPIPE)
 	signal(SIGPIPE,pipe_handler);
+	end_critical();
 	error("internal error (BROKEN PIPE)");
 #endif
 }
@@ -689,7 +686,7 @@ void copyright() {
 	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.0.17(beta), copyright (C) 1989-1999,\n");
+	printf("PARI 2.2.1(alpha), copyright (C) 2000,\n");
 	printf("     C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier.\n");
 }