===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.74
retrieving revision 1.77
diff -u -p -r1.74 -r1.77
--- OpenXM_contrib2/asir2000/parse/glob.c	2008/03/19 07:05:56	1.74
+++ OpenXM_contrib2/asir2000/parse/glob.c	2010/05/26 06:32:49	1.77
@@ -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.73 2008/01/04 16:42:19 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.76 2009/03/18 05:13:47 ohara Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -77,8 +77,6 @@
 
 #define MAXHIST 100
 
-extern int GC_free_space_divisor;
-extern int GC_free_space_numerator;
 extern FILE *asir_out;
 
 INFILE asir_infile;
@@ -331,6 +329,7 @@ FILE *in_fp;
 
 void process_args(int ac,char **av)
 {
+	int nm,dv;
 	do_asirrc = 1;
 #if !defined(MPI)
 	do_message = 1;
@@ -343,13 +342,15 @@ void process_args(int ac,char **av)
 			GC_expand_hp(atoi(*(av+1))); av += 2; ac -= 2;
 		} else if ( !strcmp(*av,"-adj") && (ac >= 2) ) {
 			char *slash;
-
 			slash = strrchr(*(av+1),'/');
 			if ( slash ) {
 				*slash = 0;
-				GC_free_space_numerator = atoi(slash+1);
+				nm = atoi(slash+1);
+			}else {
+				nm = 1;
 			}
-			GC_free_space_divisor = atoi(*(av+1));
+			dv = atoi(*(av+1));
+			Risa_GC_set_adj(nm,dv);
 			av += 2; ac -= 2;
 		} else if ( !strcmp(*av,"-cpp") && (ac >= 2) ) {
 			strcpy(cppname,*(av+1)); av += 2; ac -= 2;
@@ -528,8 +529,12 @@ void int_handler(int sig)
 
 		fprintf(stderr,"interrupt ?(q/t/c/d/u/w/?) "); fflush(stderr);
 		buf[0] = '\n';
-		while ( buf[0] == '\n' )
+		while ( !feof(stdin) && buf[0] == '\n' )
 			fgets(buf,BUFSIZ,stdin);
+		if ( feof(stdin) ) {
+			clearerr(stdin);
+			continue;
+		}
 		switch ( c = buf[0] ) {
 			case 'q':
 				while ( 1 ) {
@@ -773,7 +778,7 @@ char *get_asir_distribution();
 char *get_gcversion() 
 {
 #if defined(GC7)
-	return "GC 7.0 copyright 1988-2007, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
+	return "GC 7.1 copyright 1988-2008, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
 #else
 	return "GC 6.8 copyright 1988-2006, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
 #endif