===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -p -r1.24 -r1.28
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2001/04/23 05:02:29	1.24
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2001/10/05 01:38:21	1.28
@@ -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.23 2000/12/05 01:24:54 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.27 2001/09/20 23:11:42 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -174,7 +174,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);
@@ -698,7 +698,7 @@ void ox_asir_init(int argc,char **argv)
 	}
 	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;
@@ -715,7 +715,24 @@ void ox_asir_init(int argc,char **argv)
 void ox_io_init() {
 	unsigned char c,rc;
 	extern int I_am_server;
+	int i;
 
+	/* XXX : ssh forwards stdin to a remote host */
+#if defined(linux) || defined(__NeXT__) || defined(ultrix)
+#include <sys/param.h>
+			close(0);
+			for ( i = 5; i < NOFILE; i++ )
+				close(i);
+#else
+#include <sys/resource.h>
+			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)
@@ -767,7 +784,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)
@@ -791,6 +808,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.
  */
@@ -801,7 +842,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 */
@@ -828,7 +869,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 */
@@ -913,7 +954,7 @@ int asir_ox_init(int byteorder)
 	sprintf(ifname,"%s/.asirrc",getenv("HOME"));
 	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;