[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.62 and 1.71

version 1.62, 2006/02/08 02:11:19 version 1.71, 2007/09/19 05:56:01
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.61 2006/02/03 03:55:18 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.70 2007/09/19 05:43:00 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "al.h"  #include "al.h"
Line 214  void ExitAsir() {
Line 214  void ExitAsir() {
 /*  /*
  * status = 1 abnormal termination (error() etc.)   * status = 1 abnormal termination (error() etc.)
  * status = 2 normal termination (end(), quit() etc.)   * status = 2 normal termination (end(), quit() etc.)
    * status = 3 absolute termination
  */   */
   
 void asir_terminate(int status)  void asir_terminate(int status)
Line 221  void asir_terminate(int status)
Line 222  void asir_terminate(int status)
         int t;          int t;
         NODE n;          NODE n;
   
           /* called from engine in Windows */
           if ( status == 3 ) asir_infile = 0;
   
         if ( asir_infile && asir_infile->ready_for_longjmp )          if ( asir_infile && asir_infile->ready_for_longjmp )
                 LONGJMP(asir_infile->jmpbuf,status);                  LONGJMP(asir_infile->jmpbuf,status);
         else {          else {
Line 533  void int_handler(int sig)
Line 537  void int_handler(int sig)
                                         fgets(buf,BUFSIZ,stdin);                                          fgets(buf,BUFSIZ,stdin);
                                         if ( !strncmp(buf,"y",1) ) {                                          if ( !strncmp(buf,"y",1) ) {
                                                 fprintf(stderr,"Bye\n");                                                  fprintf(stderr,"Bye\n");
                                                   /* for terminating myself */
                                                   asir_infile = 0;
                                                 asir_terminate(1);                                                  asir_terminate(1);
                                         } else if ( !strncmp(buf,"n",1) ) {                                          } else if ( !strncmp(buf,"n",1) ) {
                                                 restore_handler();                                                  restore_handler();
Line 615  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 673  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 710  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 734  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 747  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 779  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-2005, 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 788  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-2005, 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.62  
changed lines
  Added in v.1.71
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>