===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.67
retrieving revision 1.72
diff -u -p -r1.67 -r1.72
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2010/04/23 04:44:52	1.67
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2014/05/09 19:35:51	1.72
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.66 2008/11/27 08:27:04 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 "parse.h"
@@ -55,6 +55,7 @@
 #include "genpari.h"
 #endif
 
+char *find_asirrc();
 void ox_usr1_handler();
 int asir_ox_init();
 
@@ -122,7 +123,7 @@ void ox_mpi_master_init() {
 		/* ordering information is not exchanged */
 		/* idx should be equal to i */
 		idx = get_iofp(i,0,0);
-		register_server(0,idx,idx);
+		register_server(0,idx,idx,-1);
 	}
 }
 
@@ -135,7 +136,7 @@ void ox_mpi_slave_init() {
 		/* ordering information is not exchanged */
 		/* idx should be equal to i */
 		idx = get_iofp(i,0,0);
-		register_server(0,idx,idx);
+		register_server(0,idx,idx,-1);
 	}
 	asir_OperandStackSize = BUFSIZ;
 	asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));
@@ -646,7 +647,7 @@ void asir_pops()
 void asir_setName(unsigned int serial)
 {
 	char *name;
-	int l,n;
+	size_t l,n;
 	char *dummy = "=0;";
 	SNODE snode;
 	ERR err;
@@ -668,7 +669,7 @@ void asir_setName(unsigned int serial)
 void asir_evalName(unsigned int serial)
 {
 	char *name;
-	int l,n;
+	size_t l,n;
 	SNODE snode;
 	ERR err;
 	pointer val;
@@ -793,11 +794,7 @@ static void asir_executeFunction(int serial)
 #endif
 		searchf(noargsysf,func,&f);
 		if ( !f )
-			searchf(sysf,func,&f); 
-		if ( !f )
-			searchf(ubinf,func,&f);
-		if ( !f )
-			searchf(usrf,func,&f);
+			gen_searchf_searchonly(func,&f); 
 		if ( !f ) {
 			sprintf(buf,"executeFunction : the function %s not found",func);
 			goto error;
@@ -871,11 +868,7 @@ static void asir_executeFunctionSync(int serial)
 #endif
 		searchf(noargsysf,func,&f);
 		if ( !f )
-			searchf(sysf,func,&f); 
-		if ( !f )
-			searchf(ubinf,func,&f);
-		if ( !f )
-			searchf(usrf,func,&f);
+			gen_searchf_searchonly(func,&f); 
 		if ( !f ) {
 			sprintf(buf,"executeFunction : the function %s not found",func);
 			goto error;
@@ -947,16 +940,12 @@ Obj asir_peek_one() {
 
 void ox_asir_init(int argc,char **argv,char *servername)
 {
-	char ifname[BUFSIZ];
+	char *ifname;
 	extern int GC_dont_gc;
 	extern int do_asirrc;
 	extern int do_server_in_X11;
 	extern char displayname[];
-	char *getenv();
 	static ox_asir_initialized = 0;
-	FILE *ifp;
-	char *homedir;
-	char *ptr;
 	int do_server_sav;
 #if !defined(VISUAL)
 	int tmp;
@@ -998,25 +987,10 @@ void ox_asir_init(int argc,char **argv,char *servernam
 #if defined(UINIT)
 	reg_sysf();
 #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 */
 	input_init(0,"string");
 
-	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		fclose(ifp);
+	if ( do_asirrc && (ifname = find_asirrc()) ) {
 		do_server_sav = do_server_in_X11;
 		do_server_in_X11 = 0;
 		if ( !SETJMP(main_env) )
@@ -1081,7 +1055,7 @@ void ox_io_init() {
 	read_char(iofp[0].in,&rc);
 	iofp[0].conv = c == rc ? 0 : 1;
 	/* XXX; for raw I/O */
-	register_server(0,0,0);
+	register_server(0,0,0,-1);
 }
 
 #if !defined(VISUAL)
@@ -1246,13 +1220,11 @@ int asir_ox_peek_cmo_string_length()
 int asir_ox_init(int byteorder)
 {
 	int tmp;
-	char ifname[BUFSIZ];
+	char *ifname;
 	extern int GC_dont_gc;
 	extern int do_asirrc;
 	extern int do_server_in_X11;
-	char *getenv();
 	static ox_asir_initialized = 0;
-	FILE *ifp;
 
 	GC_init();
 #if !defined(VISUAL) && !defined(MPI)
@@ -1285,9 +1257,7 @@ int asir_ox_init(int byteorder)
 	reg_sysf();
 #endif
 	input_init(0,"string");
-	sprintf(ifname,"%s/.asirrc",getenv("HOME"));
-	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
-		fclose(ifp);
+	if ( do_asirrc && (ifname = find_asirrc()) ) {
 		if ( !SETJMP(main_env) )
 			execasirfile(ifname);
 	}