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

Diff for /OpenXM_contrib2/asir2000/io/ox_asir.c between version 1.71 and 1.72

version 1.71, 2013/06/13 18:42:11 version 1.72, 2014/05/09 19:35:51
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * 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/io/ox_asir.c,v 1.70 2011/01/13 08:00:07 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.71 2013/06/13 18:42:11 ohara Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 55 
Line 55 
 #include "genpari.h"  #include "genpari.h"
 #endif  #endif
   
   char *find_asirrc();
 void ox_usr1_handler();  void ox_usr1_handler();
 int asir_ox_init();  int asir_ox_init();
   
Line 939  Obj asir_peek_one() {
Line 940  Obj asir_peek_one() {
   
 void ox_asir_init(int argc,char **argv,char *servername)  void ox_asir_init(int argc,char **argv,char *servername)
 {  {
         char ifname[BUFSIZ];          char *ifname;
         extern int GC_dont_gc;          extern int GC_dont_gc;
         extern int do_asirrc;          extern int do_asirrc;
         extern int do_server_in_X11;          extern int do_server_in_X11;
         extern char displayname[];          extern char displayname[];
         char *getenv();  
         static ox_asir_initialized = 0;          static ox_asir_initialized = 0;
         FILE *ifp;  
         char *homedir;  
         char *ptr;  
         int do_server_sav;          int do_server_sav;
 #if !defined(VISUAL)  #if !defined(VISUAL)
         int tmp;          int tmp;
Line 990  void ox_asir_init(int argc,char **argv,char *servernam
Line 987  void ox_asir_init(int argc,char **argv,char *servernam
 #if defined(UINIT)  #if defined(UINIT)
         reg_sysf();          reg_sysf();
 #endif  #endif
 /* if ASIR_CONFIG is set, execute it; else execute .asirrc */  
         if ( ptr = getenv("ASIR_CONFIG") )  
                 strcpy(ifname,ptr);  
         else {  
                 homedir = getenv("HOME");  
                 if ( !homedir ) {  
                         char rootname[BUFSIZ];  
   
                         get_rootdir(rootname,sizeof(rootname));  
                         homedir = rootname;  
                 }  
                 sprintf(ifname,"%s/.asirrc",homedir);  
         }  
   
         /* the bottom of the input stack */          /* the bottom of the input stack */
         input_init(0,"string");          input_init(0,"string");
   
         if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {          if ( do_asirrc && (ifname = find_asirrc()) ) {
                 fclose(ifp);  
                 do_server_sav = do_server_in_X11;                  do_server_sav = do_server_in_X11;
                 do_server_in_X11 = 0;                  do_server_in_X11 = 0;
                 if ( !SETJMP(main_env) )                  if ( !SETJMP(main_env) )
Line 1238  int asir_ox_peek_cmo_string_length()
Line 1220  int asir_ox_peek_cmo_string_length()
 int asir_ox_init(int byteorder)  int asir_ox_init(int byteorder)
 {  {
         int tmp;          int tmp;
         char ifname[BUFSIZ];          char *ifname;
         extern int GC_dont_gc;          extern int GC_dont_gc;
         extern int do_asirrc;          extern int do_asirrc;
         extern int do_server_in_X11;          extern int do_server_in_X11;
         char *getenv();  
         static ox_asir_initialized = 0;          static ox_asir_initialized = 0;
         FILE *ifp;  
   
         GC_init();          GC_init();
 #if !defined(VISUAL) && !defined(MPI)  #if !defined(VISUAL) && !defined(MPI)
Line 1277  int asir_ox_init(int byteorder)
Line 1257  int asir_ox_init(int byteorder)
         reg_sysf();          reg_sysf();
 #endif  #endif
         input_init(0,"string");          input_init(0,"string");
         sprintf(ifname,"%s/.asirrc",getenv("HOME"));          if ( do_asirrc && (ifname = find_asirrc()) ) {
         if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {  
                 fclose(ifp);  
                 if ( !SETJMP(main_env) )                  if ( !SETJMP(main_env) )
                         execasirfile(ifname);                          execasirfile(ifname);
         }          }
Legend:
Removed from v.1.71  
changed lines
  Added in v.1.72
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>