=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.34 retrieving revision 1.38 diff -u -p -r1.34 -r1.38 --- OpenXM_contrib2/asir2000/parse/glob.c 2003/04/02 09:43:33 1.34 +++ OpenXM_contrib2/asir2000/parse/glob.c 2003/10/19 02:54:41 1.38 @@ -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.33 2003/03/07 06:39:59 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.37 2003/09/12 01:12:41 noro Exp $ */ #include "ca.h" #include "al.h" @@ -128,8 +128,12 @@ struct oVS oGPVS,oAPVS,oEPVS; VS GPVS = &oGPVS; VS APVS = &oAPVS; VS EPVS = &oEPVS; -VS CPVS; +VS CPVS,MPVS; +NODE MODULE_LIST; +MODULE CUR_MODULE; +char *CUR_FUNC; + struct oF oF_TRUE,oF_FALSE; F F_TRUE = &oF_TRUE; F F_FALSE = &oF_FALSE; @@ -143,6 +147,7 @@ char asirname[BUFSIZ]; char displayname[BUFSIZ]; int Verbose; +int do_quiet; void glob_init() { int i; @@ -298,6 +303,7 @@ void process_args(int ac,char **av) #if !defined(MPI) do_message = 1; #endif + do_quiet = 0; while ( ac > 0 ) { if ( !strcmp(*av,"-heap") && (ac >= 2) ) { void GC_expand_hp(int); @@ -316,6 +322,7 @@ void process_args(int ac,char **av) } else if ( !strcmp(*av,"-cpp") && (ac >= 2) ) { strcpy(cppname,*(av+1)); av += 2; ac -= 2; } else if ( !strcmp(*av,"-f") && (ac >= 2) ) { + do_quiet = 1; in_fp = fopen(*(av+1),"r"); if ( !in_fp ) { fprintf(stderr,"%s does not exist!",*(av+1)); @@ -323,6 +330,8 @@ void process_args(int ac,char **av) } do_file = 1; av += 2; ac -= 2; + } else if ( !strcmp(*av,"-quiet") ) { + do_quiet = 1; av++; ac--; } else if ( !strcmp(*av,"-norc") ) { do_asirrc = 0; av++; ac--; } else if ( !strcmp(*av,"-nomessage") ) { @@ -627,7 +636,7 @@ SNODE error_snode; void error(char *s) { - SNODE *snp; + SNODE *snp=0; #if !defined(VISUAL) if ( timer_is_set ) @@ -636,7 +645,7 @@ void error(char *s) fprintf(stderr,"%s\n",s); set_lasterror(s); if ( CPVS != GPVS ) { - if ( CPVS->usrf && CPVS->usrf && CPVS->usrf->f.usrf ) + if ( CPVS && CPVS->usrf && CPVS->usrf->f.usrf ) searchsn(&BDY(CPVS->usrf->f.usrf),evalstatline,&snp); if ( snp ) error_snode = *snp;