===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/parse/glob.c,v
retrieving revision 1.1
retrieving revision 1.11
diff -u -p -r1.1 -r1.11
--- OpenXM_contrib2/asir2018/parse/glob.c	2018/09/19 05:45:08	1.1
+++ OpenXM_contrib2/asir2018/parse/glob.c	2022/09/07 03:10:56	1.11
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM$
+ * $OpenXM: OpenXM_contrib2/asir2018/parse/glob.c,v 1.10 2021/03/25 23:25:03 noro Exp $
 */
 #include "ca.h"
 #include "al.h"
@@ -257,7 +257,7 @@ void asir_terminate(int status)
 #endif
     if ( asir_out )
       fflush(asir_out);
-#if FEP
+#if defined(FEP)
     if ( do_fep ) {
       stifle_history(MAXHIST);
       write_history(asir_history);
@@ -332,7 +332,7 @@ void cppname_init()
   char oxcpp[BUFSIZ];
 #define OXCPP "/bin/ox_cpp"
 
-  if ( oxhome = getenv("OpenXM_HOME") ) {
+  if ( ( oxhome = getenv("OpenXM_HOME") ) != 0 ) {
     if ( strlen(oxhome)+strlen(OXCPP)<BUFSIZ ) {
       sprintf(oxcpp,"%s%s",oxhome,OXCPP);
       if ( access(oxcpp,X_OK&R_OK) == 0 ) {
@@ -360,6 +360,9 @@ void process_args(int ac,char **av)
 #if defined(VISUAL) && defined(VISUAL_CONSOLE)
   disable_debugger=1;
 #endif
+#if defined(FEP)
+  do_fep = 1;
+#endif
   do_quiet = 0;
   while ( ac > 0 ) {
     if ( !strcmp(*av,"-heap") && (ac >= 2) ) {
@@ -416,9 +419,11 @@ void process_args(int ac,char **av)
     } else if ( !strcmp(*av,"-display") && (ac >= 2) ) {
       strcpy(displayname,*(av+1)); av += 2; ac -= 2;
 #endif
-#if FEP
+#if defined(FEP)
     } else if ( !strcmp(*av,"-fep") ) {
       do_fep = 1; av++; ac--;
+    } else if ( !strcmp(*av,"-nofep") ) {
+      do_fep = 0; av++; ac--;
 #endif
     } else {
       fprintf(stderr,"%s : unknown option.\n",*av);
@@ -428,7 +433,7 @@ void process_args(int ac,char **av)
       asir_terminate(1);
     }
   }
-#if FEP
+#if defined(FEP)
   if ( do_fep ) {
     char *home;
     home = (char *)getenv("HOME");
@@ -568,13 +573,13 @@ void int_handler(int sig)
   }
 #endif
 #if defined(linux)
-#if 1
-  while ( stdin->_IO_read_ptr < stdin->_IO_read_end )
+#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();
 #endif
+#endif
   while ( 1 ) {
     char buf[BUFSIZ];
     char c;
@@ -853,7 +858,7 @@ char *get_asir_distribution();
 
 char *get_gcversion() 
 {
-  return "GC 7.2 copyright 1988-2012, 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() 
@@ -881,7 +886,7 @@ char *scopyright()
   static char *notice;
   char *s1, *s2, *s3, *s4;
   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-2007, 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();