[BACK]Return to glob.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / parse

Diff for /OpenXM_contrib2/asir2000/parse/glob.c between version 1.66 and 1.69

version 1.66, 2006/09/25 04:57:54 version 1.69, 2007/09/15 10:17:08
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.65 2006/02/24 01:15:57 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.68 2007/01/03 15:48:08 fujiwara Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "al.h"  #include "al.h"
Line 156  char asirname[BUFSIZ];
Line 156  char asirname[BUFSIZ];
 char displayname[BUFSIZ];  char displayname[BUFSIZ];
   
 int Verbose;  int Verbose;
 int do_quiet, do_batch;  int do_quiet;
   
 void glob_init() {  void glob_init() {
         int i;          int i;
Line 391  void process_args(int ac,char **av)
Line 391  void process_args(int ac,char **av)
   
                         paristack = atoi(*(av+1)); av += 2; ac -= 2;                          paristack = atoi(*(av+1)); av += 2; ac -= 2;
 #endif  #endif
                 } else if ( !strcmp(*av,"-batch") ) {  
                         do_batch = 1; av++; ac--;  
                 } else {                  } else {
                         fprintf(stderr,"%s : unknown option.\n",*av);                          fprintf(stderr,"%s : unknown option.\n",*av);
                         asir_terminate(1);                          asir_terminate(1);
Line 623  void ill_handler(int sig)
Line 621  void ill_handler(int sig)
 #endif  #endif
 }  }
   
   #if defined(__DARWIN__)
   #define SIGNAL_FOR_TIMER SIGALRM
   #define ITIMER_TYPE ITIMER_REAL
   #else
   #define SIGNAL_FOR_TIMER SIGVTALRM
   #define ITIMER_TYPE ITIMER_VIRTUAL
   #endif
   
 void alrm_handler(int sig)  void alrm_handler(int sig)
 {  {
         fprintf(stderr,"interval timer expired (VTALRM)\n");          fprintf(stderr,"interval timer expired (VTALRM)\n");
Line 681  void error(char *s)
Line 687  void error(char *s)
   
 #if !defined(VISUAL)  #if !defined(VISUAL)
         if ( !error_in_timer && timer_is_set )          if ( !error_in_timer && timer_is_set )
                 alrm_handler(SIGVTALRM);                  alrm_handler(SIGNAL_FOR_TIMER);
 #endif  #endif
         fprintf(stderr,"%s\n",s);          fprintf(stderr,"%s\n",s);
         set_lasterror(s);          set_lasterror(s);
Line 718  void toplevel(char *s)
Line 724  void toplevel(char *s)
   
 #if !defined(VISUAL)  #if !defined(VISUAL)
         if ( timer_is_set )          if ( timer_is_set )
                 alrm_handler(SIGVTALRM);                  alrm_handler(SIGNAL_FOR_TIMER);
 #endif  #endif
         fprintf(stderr,"%s\n",s);          fprintf(stderr,"%s\n",s);
         if ( do_file ) {          if ( do_file ) {
Line 742  void set_timer(int interval)
Line 748  void set_timer(int interval)
         it.it_interval.tv_usec = 0;          it.it_interval.tv_usec = 0;
         it.it_value.tv_sec = interval;          it.it_value.tv_sec = interval;
         it.it_value.tv_usec = 0;          it.it_value.tv_usec = 0;
         setitimer(ITIMER_VIRTUAL,&it,0);          setitimer(ITIMER_TYPE,&it,0);
         signal(SIGVTALRM,alrm_handler);          signal(SIGNAL_FOR_TIMER,alrm_handler);
         timer_is_set = 1;          timer_is_set = 1;
 }  }
   
Line 755  void reset_timer()
Line 761  void reset_timer()
         it.it_interval.tv_usec = 0;          it.it_interval.tv_usec = 0;
         it.it_value.tv_sec = 0;          it.it_value.tv_sec = 0;
         it.it_value.tv_usec = 0;          it.it_value.tv_usec = 0;
         setitimer(ITIMER_VIRTUAL,&it,0);          setitimer(ITIMER_TYPE,&it,0);
         signal(SIGVTALRM,SIG_IGN);          signal(SIGNAL_FOR_TIMER,SIG_IGN);
         timer_is_set = 0;          timer_is_set = 0;
 }  }
 #endif  #endif
Line 787  char *get_intervalversion()
Line 793  char *get_intervalversion()
   
 void copyright()  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-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";          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/.\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());          printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());
 }  }
   
Line 796  char *scopyright()
Line 802  char *scopyright()
         static char *notice;          static char *notice;
         char *s1, *s2, *s3;          char *s1, *s2, *s3;
         int d, len;          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-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";          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/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
         if (!notice) {          if (!notice) {
                 s1 = get_intervalversion();                  s1 = get_intervalversion();
                 s2 = get_asir_distribution();                  s2 = get_asir_distribution();
Legend:
Removed from v.1.66  
changed lines
  Added in v.1.69
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>