[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.65 and 1.72

version 1.65, 2006/02/24 01:15:57 version 1.72, 2007/11/15 05:39:39
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.64 2006/02/10 23:56:44 fujiwara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.71 2007/09/19 05:56:01 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "al.h"  #include "al.h"
Line 621  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 679  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 716  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 740  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 753  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 762  void reset_timer()
Line 770  void reset_timer()
 unsigned int get_asir_version();  unsigned int get_asir_version();
 char *get_asir_distribution();  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";
   #else
           return "GC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n";
   #endif
   }
   
 char *get_pariversion()  char *get_pariversion()
 {  {
 #if PARI  #if PARI
Line 785  char *get_intervalversion()
Line 802  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 *scopyright();
         printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());          fputs(scopyright(), stdout);
 }  }
   
 char *scopyright()  char *scopyright()
 {  {
         static char *notice;          static char *notice;
         char *s1, *s2, *s3;          char *s1, *s2, *s3, *s4;
         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/.\n%s%s";
         if (!notice) {          if (!notice) {
                 s1 = get_intervalversion();                  s1 = get_intervalversion();
                 s2 = get_asir_distribution();                  s2 = get_asir_distribution();
                 s3 = get_pariversion();                  s3 = get_gcversion();
                   s4 = get_pariversion();
                 d  = get_asir_version();                  d  = get_asir_version();
                 len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+sizeof(int)*3;                  len = (strlen(format)-8)+strlen(s1)+strlen(s2)+strlen(s3)+strlen(s4)+sizeof(int)*3;
                 notice = MALLOC(len+1);                  notice = MALLOC(len+1);
                 sprintf(notice, format, s1, d, s2, s3);                  sprintf(notice, format, s1, d, s2, s3, s4);
         }          }
         return notice;          return notice;
 }  }
Legend:
Removed from v.1.65  
changed lines
  Added in v.1.72
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>