=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.1.1.1 retrieving revision 1.7 diff -u -p -r1.1.1.1 -r1.7 --- OpenXM_contrib2/asir2000/parse/glob.c 1999/12/03 07:39:12 1.1.1.1 +++ OpenXM_contrib2/asir2000/parse/glob.c 2000/07/13 05:09:03 1.7 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/asir99/parse/glob.c,v 1.2 1999/11/17 08:57:10 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.6 2000/06/05 03:21:58 noro Exp $ */ #include "ca.h" #include "al.h" #include "parse.h" @@ -87,19 +87,19 @@ F F_TRUE = &oF_TRUE; F F_FALSE = &oF_FALSE; #if defined(__SVR4) && defined(sun) -char cppname[64] = "/usr/ccs/lib/cpp "; +char cppname[BUFSIZ] = "/usr/ccs/lib/cpp "; #else #if defined(__FreeBSD__) || defined(__NetBSD__) -char cppname[64] = "/usr/bin/cpp "; +char cppname[BUFSIZ] = "/usr/bin/cpp "; #else #if defined(VISUAL) -char cppname[64] = "c:\\asir\\stdlib\\cpp "; +char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp "; #else -char cppname[64] = "/lib/cpp "; +char cppname[BUFSIZ] = "/lib/cpp "; #endif #endif #endif -char asirname[64]; +char asirname[BUFSIZ]; char displayname[BUFSIZ]; int Verbose; @@ -152,6 +152,12 @@ static char asir_history[BUFSIZ]; extern int mpi_myid; +#if !defined(VISUAL_LIB) +void ExitAsir() { + exit(0); +} +#endif + /* * status = 1 abnormal termination (error() etc.) * status = 2 normal termination (end(), quit() etc.) @@ -435,6 +441,13 @@ int sig; #if defined(_PA_RISC1_1) || defined(linux) || defined(VISUAL) || defined(__svr4__) signal(SIGINT,SIG_IGN); #endif +#if !defined(VISUAL) + if ( do_server_in_X11 ) { + debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0); + restore_handler(); + return; + } +#endif #if defined(linux) #if 1 while ( stdin->_IO_read_ptr < stdin->_IO_read_end ) @@ -660,8 +673,12 @@ char *s; fprintf(stderr,"%s\n",s); set_lasterror(s); if ( CPVS != GPVS ) { - searchsn(&BDY(CPVS->usrf->f.usrf),evalstatline,&snp); - error_snode = *snp; + if ( CPVS->usrf && CPVS->usrf && CPVS->usrf->f.usrf ) + searchsn(&BDY(CPVS->usrf->f.usrf),evalstatline,&snp); + if ( snp ) + error_snode = *snp; + else + error_snode = 0; } else error_snode = 0; if ( do_file ) { @@ -714,7 +731,8 @@ void reset_timer() unsigned int get_asir_version(); void copyright() { - printf("This is Asir, Version %d.\n",get_asir_version()); + printf("This is Risa/Asir, Version %d.\n",get_asir_version()); printf("Copyright (C) FUJITSU LABORATORIES LIMITED.\n"); - printf("3 March 1994. All rights reserved.\n"); + printf("1994-1999. All rights reserved.\n"); } +