=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.64 retrieving revision 1.92 diff -u -p -r1.64 -r1.92 --- OpenXM_contrib2/asir2000/parse/glob.c 2006/02/10 23:56:44 1.64 +++ OpenXM_contrib2/asir2000/parse/glob.c 2016/08/24 05:33:58 1.92 @@ -45,20 +45,18 @@ * 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.63 2006/02/08 04:33:50 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.91 2015/08/19 05:29:23 noro Exp $ */ #include "ca.h" #include "al.h" #include "parse.h" #include "ox.h" -#if defined(PARI) -#include "genpari.h" -#endif -#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) +#include +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__) #include #endif -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include #include #else @@ -71,14 +69,12 @@ #include #endif -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #define HISTORY asir_history #endif #define MAXHIST 100 -extern int GC_free_space_divisor; -extern int GC_free_space_numerator; extern FILE *asir_out; INFILE asir_infile; @@ -86,6 +82,7 @@ JMP_BUF main_env,debug_env,timer_env,exec_env; int little_endian,debug_mode,no_debug_on_error; char *asir_libdir; char *asir_contrib_dir; +char *asir_private_dir; char *asir_pager; NODE usrf,sysf,noargsysf,ubinf,parif; @@ -147,7 +144,7 @@ struct oF oF_TRUE,oF_FALSE; F F_TRUE = &oF_TRUE; F F_FALSE = &oF_FALSE; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp "; #else char cppname[BUFSIZ] = "/lib/cpp "; @@ -169,7 +166,7 @@ void glob_init() { reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV)); reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV)); CPVS = GPVS; - MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),0); + MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),NULLP); OID(F_TRUE)=O_F; FOP(F_TRUE)=AL_TRUE; F_TRUE->arg.dummy = 0; OID(F_FALSE)=O_F; FOP(F_FALSE)=AL_FALSE; F_FALSE->arg.dummy = 0; OID(Symbol_grlex) = O_SYMBOL; Symbol_grlex->name = "@grlex"; @@ -229,12 +226,20 @@ void asir_terminate(int status) LONGJMP(asir_infile->jmpbuf,status); else { if ( user_quit_handler ) { - if ( !do_terse ) + if ( !do_terse ) { fprintf(stderr,"Calling the registered quit callbacks..."); +#if defined(__MINGW32__) + fflush(stderr); +#endif + } for ( n = user_quit_handler; n; n = NEXT(n) ) bevalf((FUNC)BDY(n),0); - if ( !do_terse ) + if ( !do_terse ) { fprintf(stderr, "done.\n"); +#if defined(__MINGW32__) + fflush(stderr); +#endif + } } tty_reset(); #if defined(MPI) @@ -243,7 +248,7 @@ void asir_terminate(int status) mpi_finalize(); #else #if defined(SIGPIPE) - signal(SIGPIPE,SIG_IGN); + set_signal(SIGPIPE,SIG_IGN); #endif close_allconnections(); #endif @@ -286,7 +291,7 @@ void sprompt(char *ptr) sprintf(ptr,"[%d] ",APVS->n); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) static int which(char *prog, char *path, char *buf, size_t size) { char *tok; @@ -319,7 +324,20 @@ static int which(char *prog, char *path, char *buf, si void cppname_init() { -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) + char *oxhome; + char oxcpp[BUFSIZ]; +#define OXCPP "/bin/ox_cpp" + + if ( oxhome = getenv("OpenXM_HOME") ) { + if ( strlen(oxhome)+strlen(OXCPP)= 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; @@ -358,6 +379,9 @@ void process_args(int ac,char **av) in_fp = fopen(*(av+1),"r"); if ( !in_fp ) { fprintf(stderr,"%s does not exist!\n",*(av+1)); +#if defined(__MINGW32__) + fflush(stderr); +#endif asir_terminate(1); } do_file = 1; @@ -377,7 +401,7 @@ void process_args(int ac,char **av) void GC_set_max_heap_size(int); GC_set_max_heap_size(atoi(*(av+1))); av += 2; ac -= 2; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) } else if ( !strcmp(*av,"-display") && (ac >= 2) ) { strcpy(displayname,*(av+1)); av += 2; ac -= 2; #endif @@ -385,14 +409,11 @@ void process_args(int ac,char **av) } else if ( !strcmp(*av,"-fep") ) { do_fep = 1; av++; ac--; #endif -#if defined(PARI) - } else if ( !strcmp(*av,"-paristack") ) { - extern int paristack; - - paristack = atoi(*(av+1)); av += 2; ac -= 2; -#endif } else { fprintf(stderr,"%s : unknown option.\n",*av); +#if defined(__MINGW32__) + fflush(stderr); +#endif asir_terminate(1); } } @@ -409,48 +430,63 @@ void process_args(int ac,char **av) #endif } -#include +#if defined(HAVE_SIGACTION) +void (*set_signal(int sig, void (*handler)(int)))(int) +{ + struct sigaction act; + struct sigaction oldact; + if (handler == SIG_IGN || handler == SIG_DFL) { + return signal(sig,handler); + } + act.sa_handler=handler; + act.sa_flags=0; + act.sa_flags |= SA_RESTART; + sigemptyset(&act.sa_mask); + sigaction(sig,&act,&oldact); + return oldact.sa_handler; +} +#endif void sig_init() { -#if !defined(VISUAL) - signal(SIGINT,int_handler); +#if !defined(VISUAL) && !defined(__MINGW32__) + set_signal(SIGINT,int_handler); #else void register_ctrlc_handler(); register_ctrlc_handler(); #endif - signal(SIGSEGV,segv_handler); + set_signal(SIGSEGV,segv_handler); #if defined(SIGFPE) - signal(SIGFPE,fpe_handler); + set_signal(SIGFPE,fpe_handler); #endif #if defined(SIGPIPE) - signal(SIGPIPE,pipe_handler); + set_signal(SIGPIPE,pipe_handler); #endif #if defined(SIGILL) - signal(SIGILL,ill_handler); + set_signal(SIGILL,ill_handler); #endif -#if !defined(VISUAL) - signal(SIGBUS,bus_handler); +#if !defined(VISUAL) && !defined(__MINGW32__) + set_signal(SIGBUS,bus_handler); #endif } static void (*old_int)(int); void asir_save_handler() { - old_int = signal(SIGINT,SIG_IGN); - signal(SIGINT,old_int); + old_int = set_signal(SIGINT,SIG_IGN); + set_signal(SIGINT,old_int); } void asir_set_handler() { - signal(SIGINT,int_handler); + set_signal(SIGINT,int_handler); } void asir_reset_handler() { - signal(SIGINT,old_int); + set_signal(SIGINT,old_int); } extern int I_am_server; @@ -463,21 +499,21 @@ void resetenv(char *s) while ( NEXT(asir_infile) ) closecurrentinput(); resetpvs(); -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( do_server_in_X11 ) #endif show_debug_window(0); #if defined(VISUAL_LIB) w_noflush_stderr(0); #endif - asir_out = stdout; -#if defined(PARI) - pari_outfile = stdout; +#if defined(__MINGW32__) + fflush(stderr); #endif + asir_out = stdout; /* restore states */ reset_engine(); reset_io(); -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) reset_timer(); #endif LONGJMP(main_env,1); @@ -489,6 +525,8 @@ void fatal(int n) } extern int ox_int_received, critical_when_signal; +extern int in_gc, caught_intr; +extern int ox_get_pari_result; void int_handler(int sig) { @@ -499,15 +537,19 @@ void int_handler(int sig) if ( do_file ) { ExitAsir(); } - if ( critical_when_signal ) { + if ( !ox_get_pari_result && critical_when_signal ) { ox_int_received = 1; return; } -#if defined(VISUAL) + if ( in_gc ) { + caught_intr = 1; + return; + } +#if defined(VISUAL) || defined(__MINGW32__) suspend_timer(); #endif - signal(SIGINT,SIG_IGN); -#if !defined(VISUAL) + set_signal(SIGINT,SIG_IGN); +#if !defined(VISUAL) && !defined(__MINGW32__) if ( do_server_in_X11 ) { debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0); restore_handler(); @@ -528,8 +570,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 ) { @@ -537,6 +583,11 @@ void int_handler(int sig) fgets(buf,BUFSIZ,stdin); if ( !strncmp(buf,"y",1) ) { fprintf(stderr,"Bye\n"); +#if defined(__MINGW32__) + fflush(stderr); +#endif + /* for terminating myself */ + asir_infile = 0; asir_terminate(1); } else if ( !strncmp(buf,"n",1) ) { restore_handler(); @@ -561,13 +612,21 @@ void int_handler(int sig) restore_handler(); if ( c == 'u' ) { if ( user_int_handler ) { - if ( !do_terse ) + if ( !do_terse ) { fprintf(stderr, "Calling the registered exception callbacks..."); +#if defined(__MINGW32__) + fflush(stderr); +#endif + } for ( t = user_int_handler; t; t = NEXT(t) ) bevalf((FUNC)BDY(t),0); - if ( !do_terse ) + if ( !do_terse ) { fprintf(stderr, "done.\n"); +#if defined(__MINGW32__) + fflush(stderr); +#endif + } } } resetenv("return to toplevel"); @@ -587,6 +646,9 @@ void int_handler(int sig) break; case '?': fprintf(stderr, "q:quit t:toplevel c:continue d:debug u:call registered handler w:where\n"); +#if defined(__MINGW32__) + fflush(stderr); +#endif break; default: break; @@ -595,18 +657,18 @@ void int_handler(int sig) } void restore_handler() { -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) resume_timer(); #endif #if defined(SIGINT) - signal(SIGINT,int_handler); + set_signal(SIGINT,int_handler); #endif } void segv_handler(int sig) { #if defined(SIGSEGV) - signal(SIGSEGV,segv_handler); + set_signal_for_restart(SIGSEGV,segv_handler); error("internal error (SEGV)"); #endif } @@ -614,21 +676,32 @@ void segv_handler(int sig) void ill_handler(int sig) { #if defined(SIGILL) - signal(SIGILL,ill_handler); + set_signal_for_restart(SIGILL,ill_handler); error("illegal instruction (ILL)"); #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) { fprintf(stderr,"interval timer expired (VTALRM)\n"); +#if defined(__MINGW32__) + fflush(stderr); +#endif LONGJMP(timer_env,1); } void bus_handler(int sig) { #if defined(SIGBUS) - signal(SIGBUS,bus_handler); + set_signal_for_restart(SIGBUS,bus_handler); error("internal error (BUS ERROR)"); #endif } @@ -636,7 +709,7 @@ void bus_handler(int sig) void fpe_handler(int sig) { #if defined(SIGFPE) - signal(SIGFPE,fpe_handler); + set_signal_for_restart(SIGFPE,fpe_handler); error("internal error (FPE)"); #endif } @@ -644,7 +717,7 @@ void fpe_handler(int sig) void pipe_handler(int sig) { #if defined(SIGPIPE) - signal(SIGPIPE,pipe_handler); + set_signal_for_restart(SIGPIPE,pipe_handler); end_critical(); error("internal error (BROKEN PIPE)"); #endif @@ -675,11 +748,14 @@ void error(char *s) { SNODE *snp=0; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( !error_in_timer && timer_is_set ) - alrm_handler(SIGVTALRM); + alrm_handler(SIGNAL_FOR_TIMER); #endif fprintf(stderr,"%s\n",s); +#if defined(__MINGW32__) + fflush(stderr); +#endif set_lasterror(s); if ( CPVS != GPVS ) { if ( CPVS && CPVS->usrf && CPVS->usrf->f.usrf ) @@ -708,15 +784,18 @@ void error(char *s) resetenv("return to toplevel"); } -void toplevel(char *s) +void goto_toplevel(char *s) { SNODE *snp=0; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( timer_is_set ) - alrm_handler(SIGVTALRM); + alrm_handler(SIGNAL_FOR_TIMER); #endif fprintf(stderr,"%s\n",s); +#if defined(__MINGW32__) + fflush(stderr); +#endif if ( do_file ) { char errbuf[BUFSIZ*5]; /* sufficient to store stack information ? */ @@ -727,7 +806,7 @@ void toplevel(char *s) resetenv("return to toplevel"); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) #include void set_timer(int interval) @@ -738,8 +817,8 @@ void set_timer(int interval) it.it_interval.tv_usec = 0; it.it_value.tv_sec = interval; it.it_value.tv_usec = 0; - setitimer(ITIMER_VIRTUAL,&it,0); - signal(SIGVTALRM,alrm_handler); + setitimer(ITIMER_TYPE,&it,0); + set_signal(SIGNAL_FOR_TIMER,alrm_handler); timer_is_set = 1; } @@ -751,8 +830,8 @@ void reset_timer() it.it_interval.tv_usec = 0; it.it_value.tv_sec = 0; it.it_value.tv_usec = 0; - setitimer(ITIMER_VIRTUAL,&it,0); - signal(SIGVTALRM,SIG_IGN); + setitimer(ITIMER_TYPE,&it,0); + set_signal(SIGNAL_FOR_TIMER,SIG_IGN); timer_is_set = 0; } #endif @@ -760,15 +839,13 @@ void reset_timer() unsigned int get_asir_version(); char *get_asir_distribution(); +char *get_gcversion() +{ + return "GC 7.2 copyright 1988-2012, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n"; +} + char *get_pariversion() { -#if PARI -#if 0 - return PARIVERSION", Copyright (C) 2000-2005 The PARI Group.\n"; -#else - return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n H. Cohen and M. Olivier.\n"; -#endif -#endif return ""; } @@ -783,24 +860,41 @@ char *get_intervalversion() 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"; - printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion()); + char *scopyright(); + fputs(scopyright(), stdout); } char *scopyright() { static char *notice; - char *s1, *s2, *s3; + char *s1, *s2, *s3, *s4; 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) { s1 = get_intervalversion(); s2 = get_asir_distribution(); - s3 = get_pariversion(); + s3 = get_gcversion(); + s4 = get_pariversion(); 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); - sprintf(notice, format, s1, d, s2, s3); + sprintf(notice, format, s1, d, s2, s3, s4); } return notice; } + +#if defined(VISUAL) || defined(__MINGW32__) +void check_intr() +{ + extern int recv_intr; + if ( recv_intr ) { + if ( recv_intr == 1 ) { + recv_intr = 0; + int_handler(0); + } else { + recv_intr = 0; + ox_usr1_handler(0); + } + } +} +#endif