===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.35
retrieving revision 1.40
diff -u -p -r1.35 -r1.40
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2001/12/25 02:39:05	1.35
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2002/08/02 02:28:27	1.40
@@ -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.34 2001/12/21 08:23:14 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.39 2002/02/25 06:47:39 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -58,7 +58,8 @@
 void ox_usr1_handler();
 int asir_ox_init();
 
-extern JMP_BUF environnement;
+/* environement is defined in libpari.a */
+extern jmp_buf environnement;
 
 extern int do_message;
 extern int ox_flushing;
@@ -77,7 +78,7 @@ Obj *asir_OperandStack;
 int asir_OperandStackPtr = -1;
 
 void ox_io_init();
-void ox_asir_init(int,char **);
+void ox_asir_init(int,char **,char *);
 Obj asir_pop_one();
 Obj asir_peek_one();
 void asir_push_one(Obj);
@@ -139,7 +140,7 @@ void ox_main(int argc,char **argv) {
 	int ret;
 	extern char LastError[];
 
-	ox_asir_init(argc,argv);
+	ox_asir_init(argc,argv,"ox_asir");
 	if ( do_message )
 		fprintf(stderr,"I'm an ox_asir, Version %d.\n",ASIR_VERSION);
 	if ( SETJMP(ox_env) ) {
@@ -488,7 +489,8 @@ int asir_executeString()
 	char *cmd;
 #if PARI
 	recover(0);
-	if ( SETJMP(environnement) ) {
+	/* environement is defined in libpari.a */
+	if ( setjmp(environnement) ) {
 		avma = top; recover(1);
 		resetenv("");
 	}
@@ -634,13 +636,14 @@ Obj asir_peek_one() {
 	}
 }
 
-void ox_asir_init(int argc,char **argv)
+void ox_asir_init(int argc,char **argv,char *servername)
 {
 	char ifname[BUFSIZ];
 	extern int GC_dont_gc;
 	extern int read_exec_file;
 	extern int do_asirrc;
 	extern int do_server_in_X11;
+	extern char displayname[];
 	char *getenv();
 	static ox_asir_initialized = 0;
 	FILE *ifp;
@@ -664,6 +667,10 @@ void ox_asir_init(int argc,char **argv)
 	endian_init();
 	GC_init();
 	process_args(--argc,++argv);
+#if defined(__CYGWIN__)
+	if ( !displayname[0] )
+		do_server_in_X11 = 0; /* XXX */
+#endif
 	output_init();
 	arf_init();
 	nglob_init();
@@ -705,7 +712,7 @@ void ox_asir_init(int argc,char **argv)
 	input_init(0,"string");
 /* XXX Windows compatibility */
 	ox_io_init();
-	create_my_mathcap("ox_asir");
+	create_my_mathcap(servername);
 }
 
 void ox_io_init() {
@@ -893,14 +900,27 @@ int asir_ox_peek_cmo_size()
 	Obj obj;
 	int len;
 
-	obj = asir_pop_one();
-	asir_push_one(obj);
+	obj = asir_peek_one();
 	if ( !valid_as_cmo(obj) ) {
 		fprintf(stderr,"The object at the stack top is invalid as a CMO.\n");
 		return 0;
 	}
 	len = count_as_cmo(obj);
 	return len;
+}
+
+int asir_ox_peek_cmo_string_length()
+{
+	Obj obj;
+	int len;
+
+	obj = asir_peek_one();
+	if ( !valid_as_cmo(obj) ) {
+		fprintf(stderr,"The object at the stack top is invalid as a CMO.\n");
+		return 0;
+	}
+	len = estimate_length(CO,obj);
+	return len+1;
 }
 
 /*