=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.62 retrieving revision 1.64 diff -u -p -r1.62 -r1.64 --- OpenXM_contrib2/asir2000/parse/glob.c 2006/02/08 02:11:19 1.62 +++ OpenXM_contrib2/asir2000/parse/glob.c 2006/02/10 23:56:44 1.64 @@ -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.61 2006/02/03 03:55:18 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.63 2006/02/08 04:33:50 noro Exp $ */ #include "ca.h" #include "al.h" @@ -214,6 +214,7 @@ void ExitAsir() { /* * status = 1 abnormal termination (error() etc.) * status = 2 normal termination (end(), quit() etc.) + * status = 3 absolute termination */ void asir_terminate(int status) @@ -221,6 +222,9 @@ void asir_terminate(int status) int t; NODE n; + /* called from engine in Windows */ + if ( status == 3 ) asir_infile = 0; + if ( asir_infile && asir_infile->ready_for_longjmp ) LONGJMP(asir_infile->jmpbuf,status); else { @@ -779,7 +783,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-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"; + char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2006, 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()); } @@ -788,7 +792,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-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"; + char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2006, 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();