=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/parse/glob.c,v retrieving revision 1.8 retrieving revision 1.10 diff -u -p -r1.8 -r1.10 --- OpenXM_contrib2/asir2018/parse/glob.c 2020/10/06 06:31:20 1.8 +++ OpenXM_contrib2/asir2018/parse/glob.c 2021/03/25 23:25:03 1.10 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2018/parse/glob.c,v 1.7 2020/06/20 05:56:08 fujimoto Exp $ + * $OpenXM: OpenXM_contrib2/asir2018/parse/glob.c,v 1.9 2020/11/15 16:15:17 fujimoto Exp $ */ #include "ca.h" #include "al.h" @@ -567,17 +567,14 @@ void int_handler(int sig) return; } #endif -#if !defined(ANDROID) && defined(linux) -/* -#if 1 - while ( stdin->_IO_read_ptr < stdin->_IO_read_end ) +#if defined(linux) +#if !defined(__GLIBC__) && !defined(ANDROID) + if( __freadahead(stdin) > 0 ) __fpurge(stdin); #else - while ( stdin->_gptr < stdin->_egptr ) -#endif + while ( FP_DATA_IS_AVAILABLE(stdin) ) getchar(); -*/ - if( __freadable(stdin) ) __fpurge(stdin); #endif +#endif while ( 1 ) { char buf[BUFSIZ]; char c; @@ -856,7 +853,7 @@ char *get_asir_distribution(); char *get_gcversion() { - return "GC 7.4.2 copyright 1988-2015, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n"; + return "GC 7.6.12 copyright 1988-2018, H-J. Boehm, A. J. Demers, Xerox, SGI, HP, I. Maidanski.\n"; } char *get_pariversion() @@ -884,7 +881,7 @@ char *scopyright() static char *notice; char *s1, *s2, *s3, *s4; int d, len; - char *format = "This is Risa/Asir%s, full GMP Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2019, Risa/Asir committers, http://www.openxm.org/.\n%s%s"; + char *format = "This is Risa/Asir%s, full GMP Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2021, Risa/Asir committers, http://www.openxm.org/.\n%s%s"; if (!notice) { s1 = get_intervalversion(); s2 = get_asir_distribution();