===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.17
retrieving revision 1.33
diff -u -p -r1.17 -r1.33
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2000/08/29 04:03:06	1.17
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2001/10/22 09:14:35	1.33
@@ -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.16 2000/08/22 05:04:18 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.32 2001/10/09 01:36:21 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -70,28 +70,32 @@ extern int little_endian,ox_sock_id;
 int ox_sock_id;
 int lib_ox_need_conv;
 
-static int asir_OperandStackSize;
-static Obj *asir_OperandStack;
-static int asir_OperandStackPtr = -1;
+void create_error(ERR *,unsigned int ,char *);
 
-static void create_error(ERR *,unsigned int ,char *);
-static void ox_io_init();
-static void ox_asir_init(int,char **);
-static Obj asir_pop_one();
-static void asir_push_one(Obj);
-static void asir_end_flush();
-static void asir_executeFunction(int);
-static int asir_executeString();
-static void asir_evalName(unsigned int);
-static void asir_setName(unsigned int);
-static void asir_pops();
-static void asir_popString();
-static void asir_popCMO(unsigned int);
-static void asir_popSerializedLocalObject();
-static LIST asir_GetErrorList();
-static char *name_of_cmd(int);
-static char *name_of_id(int);
+int asir_OperandStackSize;
+Obj *asir_OperandStack;
+int asir_OperandStackPtr = -1;
+
+void ox_io_init();
+void ox_asir_init(int,char **);
+Obj asir_pop_one();
+Obj asir_peek_one();
+void asir_push_one(Obj);
+void asir_end_flush();
+int asir_executeString();
+void asir_evalName(unsigned int);
+void asir_setName(unsigned int);
+void asir_pops();
+void asir_popString();
+void asir_popCMO(unsigned int);
+void asir_popSerializedLocalObject();
+void asir_pushCMOtag(unsigned int);
+LIST asir_GetErrorList();
+char *name_of_cmd(int);
+char *name_of_id(int);
+
 static void asir_do_cmd(int,unsigned int);
+static void asir_executeFunction(int);
 
 #if MPI
 /* XXX : currently MPI version supports only a homogeneous cluster. */
@@ -126,32 +130,11 @@ void ox_mpi_slave_init() {
 }
 #endif
 
-static void create_error(ERR *err,unsigned int serial,char *msg)
-{
-	int len;
-	USINT ui;
-	NODE n,n1;
-	LIST list;
-	char *msg1;
-	STRING errmsg;
-
-	MKUSINT(ui,serial);
-	len = strlen(msg);
-	msg1 = (char *)MALLOC(len+1);
-	strcpy(msg1,msg);
-	MKSTR(errmsg,msg1);
-	MKNODE(n1,errmsg,0); MKNODE(n,ui,n1); MKLIST(list,n);
-	MKERR(*err,list);
-}
-
 void ox_main(int argc,char **argv) {
 	int id;
 	int cmd;
 	Obj obj;
-	USINT ui;
 	ERR err;
-	LIST list;
-	NODE n,n1;
 	unsigned int serial;
 	int ret;
 	extern char LastError[];
@@ -188,7 +171,7 @@ void ox_main(int argc,char **argv) {
 					break;
 				if ( do_message )
 					fprintf(stderr," %s\n",name_of_cmd(cmd));
-				if ( ret = setjmp(env) ) {
+				if ( ret = setjmp(main_env) ) {
 					if ( ret == 1 ) {
 						create_error(&err,serial,LastError);
 						asir_push_one((Obj)err);
@@ -271,13 +254,16 @@ static void asir_do_cmd(int cmd,unsigned int serial)
 			client_mathcap = (MATHCAP)asir_pop_one();
 			store_remote_mathcap(0,client_mathcap);
 			break;
+		case SM_pushCMOtag:
+			asir_pushCMOtag(serial);
+			break;
 		case SM_nop:
 		default:
 			break;
 	}
 }
 
-static char *name_of_id(int id)
+char *name_of_id(int id)
 {
 	switch ( id ) {
 		case OX_COMMAND:
@@ -298,7 +284,7 @@ static char *name_of_id(int id)
 	}
 }
 
-static char *name_of_cmd(int cmd)
+char *name_of_cmd(int cmd)
 {
 	switch ( cmd ) {
 		case SM_popSerializedLocalObject:
@@ -348,13 +334,15 @@ static char *name_of_cmd(int cmd)
 			break;
 		case SM_nop:
 			return "SM_nop";
+		case SM_pushCMOtag:
+			return "SM_pushCMOtag";
 		default:
 			return "Unknown cmd";
 			break;
 	}
 }
 
-static LIST asir_GetErrorList()
+LIST asir_GetErrorList()
 {
 	int i;
 	NODE n,n0;
@@ -371,7 +359,7 @@ static LIST asir_GetErrorList()
 	return err;
 }
 
-static void asir_popSerializedLocalObject()
+void asir_popSerializedLocalObject()
 {
 	Obj obj;
 	VL t,vl;
@@ -387,7 +375,7 @@ static void asir_popSerializedLocalObject()
 	ox_send_cmd(0,SM_endBlock);
 }
 
-static void asir_popCMO(unsigned int serial)
+void asir_popCMO(unsigned int serial)
 {
 	Obj obj;
 	ERR err;
@@ -402,8 +390,25 @@ static void asir_popCMO(unsigned int serial)
 	}
 }
 
-static void asir_popString()
+void asir_pushCMOtag(unsigned int serial)
 {
+	Obj obj;
+	ERR err;
+	USINT ui;
+	int tag;
+
+	obj = asir_peek_one();
+	if ( cmo_tag(obj,&tag) ) {
+		MKUSINT(ui,tag);
+		asir_push_one((Obj)ui);
+	} else {
+		create_error(&err,serial,"cannot convert to CMO object");
+		asir_push_one((Obj)err);
+	}
+}
+
+void asir_popString()
+{
 	Obj val;
 	char *buf,*obuf;
 	int l;
@@ -411,7 +416,7 @@ static void asir_popString()
 
 	val = asir_pop_one();
 	if ( !val )
-		obuf = 0;
+		obuf = "0";
 	else {
 		l = estimate_length(CO,val);
 		buf = (char *)ALLOCA(l+1);
@@ -425,7 +430,7 @@ static void asir_popString()
 	ox_send_data(0,str);
 }
 
-static void asir_pops()
+void asir_pops()
 {
 	int n;
 
@@ -433,7 +438,7 @@ static void asir_pops()
 	asir_OperandStackPtr = MAX(asir_OperandStackPtr-n,-1);
 }
 
-static void asir_setName(unsigned int serial)
+void asir_setName(unsigned int serial)
 {
 	char *name;
 	int l,n;
@@ -455,7 +460,7 @@ static void asir_setName(unsigned int serial)
 	}
 }
 
-static void asir_evalName(unsigned int serial)
+void asir_evalName(unsigned int serial)
 {
 	char *name;
 	int l,n;
@@ -476,7 +481,7 @@ static void asir_evalName(unsigned int serial)
 	asir_push_one(val);
 }
 
-static int asir_executeString()
+int asir_executeString()
 {
 	SNODE snode;
 	pointer val;
@@ -514,11 +519,9 @@ static void asir_executeFunction(int serial)
 	int argc;
 	FUNC f;
 	Obj result;
-	VL vl;
 	NODE n,n1; 
 	STRING fname;
 	char *path;
-	USINT ui;
 	ERR err;
 	Obj arg;
 	static char buf[BUFSIZ];
@@ -581,7 +584,7 @@ error:
 	asir_push_one(result);
 }
 
-static void asir_end_flush()
+void asir_end_flush()
 {
 	ox_flushing = 0;
 }
@@ -593,7 +596,7 @@ static void asir_end_flush()
 */
 
 
-static void asir_push_one(Obj obj)
+void asir_push_one(Obj obj)
 {
 	if ( !obj || OID(obj) != O_VOID ) {
 		asir_OperandStackPtr++;
@@ -607,7 +610,7 @@ static void asir_push_one(Obj obj)
 	}
 }
 
-static Obj asir_pop_one() {
+Obj asir_pop_one() {
 	if ( asir_OperandStackPtr < 0 ) {
 		if ( do_message )
 			fprintf(stderr,"OperandStack underflow");
@@ -619,9 +622,20 @@ static Obj asir_pop_one() {
 	}
 }
 
-static void ox_asir_init(int argc,char **argv)
+Obj asir_peek_one() {
+	if ( asir_OperandStackPtr < 0 ) {
+		if ( do_message )
+			fprintf(stderr,"OperandStack underflow");
+		return 0;
+	} else {
+		if ( do_message )
+			fprintf(stderr,"peek at %d\n",asir_OperandStackPtr);
+		return asir_OperandStack[asir_OperandStackPtr];
+	}
+}
+
+void ox_asir_init(int argc,char **argv)
 {
-	int tmp;
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
 	extern int read_exec_file;
@@ -632,6 +646,9 @@ static void ox_asir_init(int argc,char **argv)
 	FILE *ifp;
 	char *homedir;
 	char *ptr;
+#if !defined(VISUAL)
+	int tmp;
+#endif
 
 #if !defined(VISUAL) && !MPI
 	do_server_in_X11 = 1; /* XXX */
@@ -642,16 +659,9 @@ static void ox_asir_init(int argc,char **argv)
 #endif
 	srandom((int)get_current_time());
 
-#if defined(THINK_C)
-	param_init();
-#endif
-	StackBottom = &tmp + 1; /* XXX */
 	rtime_init();
 	env_init();
 	endian_init();
-#if !defined(VISUAL) && !defined(THINK_C)
-/*	check_key(); */
-#endif
 	GC_init();
 	process_args(--argc,++argv);
 	output_init();
@@ -674,9 +684,6 @@ static void ox_asir_init(int argc,char **argv)
 	if ( ptr = getenv("ASIR_CONFIG") )
 		strcpy(ifname,ptr);
 	else {
-#if defined(THINK_C)
-		sprintf(ifname,"asirrc");
-#else
 		homedir = getenv("HOME");
 		if ( !homedir ) {
 			char rootname[BUFSIZ];
@@ -685,11 +692,10 @@ static void ox_asir_init(int argc,char **argv)
 			homedir = rootname;
 		}
 		sprintf(ifname,"%s/.asirrc",homedir);
-#endif
 	}
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(env) ) {
+		if ( !setjmp(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;
@@ -697,15 +703,35 @@ static void ox_asir_init(int argc,char **argv)
 		fclose(ifp);
 	}
 	input_init(0,"string");
-#if !MPI
+/* XXX Windows compatibility */
 	ox_io_init();
-#endif
 	create_my_mathcap("ox_asir");
 }
 
-static void ox_io_init() {
+void ox_io_init() {
 	unsigned char c,rc;
+	extern int I_am_server;
 
+	/* XXX : ssh forwards stdin to a remote host on PC Unix */
+#if defined(linux)
+#include <sys/param.h>
+	int i;
+
+	close(0);
+	for ( i = 5; i < NOFILE; i++ )
+		close(i);
+#elif defined(__FreeBSD__)
+#include <sys/resource.h>
+	int i;
+	struct rlimit rl;
+
+	getrlimit(RLIMIT_NOFILE,&rl);
+	close(0);
+	for ( i = 5; i < rl.rlim_cur; i++ )
+		close(i);
+#endif
+
+	I_am_server = 1;
 	endian_init();
 #if defined(VISUAL)
 	if ( !ox_sock_id )
@@ -756,7 +782,7 @@ void asir_ox_push_cmo(void *cmo)
 
 /*
  * Pop an object from the stack and converts it
- * int a binary encoded CMO.
+ * into a binary encoded CMO.
  */
 
 int asir_ox_pop_cmo(void *cmo, int limit)
@@ -780,6 +806,30 @@ int asir_ox_pop_cmo(void *cmo, int limit)
 		return -1;
 }
 
+int asir_ox_pop_string(void *string, int limit)
+{
+	Obj val;
+	int l;
+
+	val = asir_pop_one();
+	if ( !val ) {
+		if ( limit >= 2 ) {
+			sprintf(string,"0");
+			l = strlen(string);
+		} else
+			l = -1;
+	} else {
+		l = estimate_length(CO,val);
+		if ( l+1 <= limit ) {
+			soutput_init(string);
+			sprintexpr(CO,val);
+			l = strlen(string);
+		} else
+			l = -1;
+	}
+	return l;
+}
+
 /*
  * Executes an SM command.
  */
@@ -790,7 +840,7 @@ void asir_ox_push_cmd(int cmd)
 	ERR err;
 	extern char LastError[];
 
-	if ( ret = setjmp(env) ) {
+	if ( ret = setjmp(main_env) ) {
 		asir_reset_handler();
 		if ( ret == 1 ) {
 			create_error(&err,0,LastError); /* XXX */
@@ -817,7 +867,7 @@ void asir_ox_execute_string(char *s)
 
 	MKSTR(str,s);
 	asir_push_one((Obj)str);
-	if ( ret = setjmp(env) ) {
+	if ( ret = setjmp(main_env) ) {
 		asir_reset_handler();
 		if ( ret == 1 ) {
 			create_error(&err,0,LastError); /* XXX */
@@ -878,16 +928,9 @@ int asir_ox_init(int byteorder)
 #endif
 	srandom((int)get_current_time());
 
-#if defined(THINK_C)
-	param_init();
-#endif
-	StackBottom = &tmp + 1; /* XXX */
 	rtime_init();
 	env_init();
 	endian_init();
-#if !defined(VISUAL) && !defined(THINK_C)
-/*	check_key(); */
-#endif
 	GC_init();
 /*	process_args(argc,argv); */
 	output_init();
@@ -906,14 +949,10 @@ int asir_ox_init(int byteorder)
 #if defined(UINIT)
 	reg_sysf();
 #endif
-#if defined(THINK_C)
-	sprintf(ifname,"asirrc");
-#else
 	sprintf(ifname,"%s/.asirrc",getenv("HOME"));
-#endif
 	if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
 		input_init(ifp,ifname);
-		if ( !setjmp(env) ) {
+		if ( !setjmp(main_env) ) {
 			read_exec_file = 1;
 			read_eval_loop();
 			read_exec_file = 0;