===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.36
retrieving revision 1.42
diff -u -p -r1.36 -r1.42
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2001/12/27 07:51:17	1.36
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2003/03/07 03:12:28	1.42
@@ -44,14 +44,14 @@
  * 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.35 2001/12/25 02:39:05 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.41 2003/02/14 22:29:15 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include "signal.h"
 #include "ox.h"
 #include "version.h"
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 #endif
 
@@ -78,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);
@@ -140,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) ) {
@@ -487,7 +487,7 @@ int asir_executeString()
 	SNODE snode;
 	pointer val;
 	char *cmd;
-#if PARI
+#if defined(PARI)
 	recover(0);
 	/* environement is defined in libpari.a */
 	if ( setjmp(environnement) ) {
@@ -636,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;
@@ -656,7 +657,7 @@ void ox_asir_init(int argc,char **argv)
 	do_server_in_X11 = 1; /* XXX */
 #endif
 	asir_save_handler();
-#if PARI
+#if defined(PARI)
 	risa_pari_init();
 #endif
 	srandom((int)get_current_time());
@@ -666,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();
@@ -707,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() {
@@ -895,8 +900,7 @@ 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;
@@ -905,6 +909,20 @@ int asir_ox_peek_cmo_size()
 	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;
+}
+
 /*
  * Initialization.
  * byteorder=0 => native
@@ -927,7 +945,7 @@ int asir_ox_init(int byteorder)
 	do_server_in_X11 = 0; /* XXX */
 #endif
 	asir_save_handler();
-#if PARI
+#if defined(PARI)
 	risa_pari_init();
 #endif
 	srandom((int)get_current_time());