===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.53
retrieving revision 1.57
diff -u -p -r1.53 -r1.57
--- OpenXM_contrib2/asir2000/parse/glob.c	2004/12/17 03:09:08	1.53
+++ OpenXM_contrib2/asir2000/parse/glob.c	2005/07/12 02:37:32	1.57
@@ -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.52 2004/12/15 22:51:40 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.56 2005/03/24 23:40:50 takayama Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -85,6 +85,7 @@ INFILE asir_infile;
 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_pager;
 
 NODE usrf,sysf,noargsysf,ubinf,parif;
@@ -225,6 +226,12 @@ void asir_terminate(int status)
 		else
 			LONGJMP(exec_env,status);
 	} else {
+		if ( user_quit_handler ) {
+			fprintf(stderr,"Calling the registered quit callbacks...");
+			for ( n = user_quit_handler; n; n = NEXT(n) )
+				bevalf((FUNC)BDY(n),0);
+			fprintf(stderr, "done.\n");
+		}
 		tty_reset();
 #if defined(MPI)
 		if ( !mpi_myid )
@@ -244,12 +251,6 @@ void asir_terminate(int status)
 			write_history(asir_history);
 		}
 #endif
-		if ( user_quit_handler ) {
-			fprintf(stderr,"Calling the registered quit callbacks...");
-			for ( n = user_quit_handler; n; n = NEXT(n) )
-				bevalf((FUNC)BDY(n),0);
-			fprintf(stderr, "done.\n");
-		}
 		ExitAsir();
 	}
 }
@@ -780,7 +781,7 @@ 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-2004, Risa/Asir committers, http://www.openxm.org/.\nGC 6.2(alpha6) copyright 1988-2003, 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-2005, 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());
 }
 
@@ -789,7 +790,7 @@ char *scopyright()
 	static char *notice;
 	char *s1, *s2, *s3;
 	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-2003, Risa/Asir committers, http://www.openxm.org/.\nGC 6.2(alpha6) copyright 1988-2003, 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-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
 	if (!notice) {
 		s1 = get_intervalversion();
 		s2 = get_asir_distribution();