===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v
retrieving revision 1.43
retrieving revision 1.52
diff -u -p -r1.43 -r1.52
--- OpenXM_contrib2/asir2000/builtin/ctrl.c	2014/05/26 09:34:06	1.43
+++ OpenXM_contrib2/asir2000/builtin/ctrl.c	2016/08/26 04:56:07	1.52
@@ -45,14 +45,16 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.42 2014/05/13 15:02:28 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.51 2016/08/24 01:33:53 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 #include <string.h>
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <windows.h>
+#include <winnls.h>
 #else
+#include <locale.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -67,6 +69,7 @@ static struct {
 	char *arch;
 	char *release;
 	char *full;
+	char *lang;
 } sysinfo;
 
 void Pctrl();
@@ -81,7 +84,7 @@ struct ftab ctrl_tab[] = {
 };
 
 extern int error_in_timer;
-extern int prtime,nez,echoback,bigfloat;
+extern int prtime,nez,echoback,bigfloat,evalef;
 extern int debug_up;
 extern int GC_max_heap_size,Verbose,hideargs,hex_output,do_server_in_X11;
 extern int do_message,do_terse;
@@ -109,6 +112,7 @@ extern int diag_period;
 extern int weight_check;
 extern char **ASIRLOADPATH;
 extern int ASIRLOADPATH_LEN;
+extern int No_ox_reset;
 
 static struct {
 	char *key;
@@ -118,9 +122,8 @@ static struct {
 	{"cputime",&prtime},
 	{"nez",&nez},
 	{"echo",&echoback},
-#if defined(PARI)
 	{"bigfloat",&bigfloat},
-#endif
+	{"evalef",&evalef},
 	{"verbose",&Verbose},
 	{"quiet_mode",&do_quiet},
 	{"hideargs",&hideargs},
@@ -149,6 +152,8 @@ static struct {
 	{"no_debug_on_error",&no_debug_on_error},
 	{"diag_period",&diag_period},
 	{"weight_check",&weight_check},
+	{"no_ox_reset",&No_ox_reset},
+	{"fake_ox_reset",&No_ox_reset},
 #if defined(INTERVAL)
 	{"zerorewrite",&zerorewrite},
 	{"itvplotsize",&Itvplot},
@@ -170,6 +175,10 @@ Q *rp;
 	STRING s;
 	NODE node,p;
 	LIST list;
+	P f;
+	extern Q ox_pari_stream;
+	extern int ox_pari_stream_initialized;
+	extern P ox_pari_starting_function;
 
 	if ( !arg ) {
 		*rp = 0;
@@ -258,6 +267,39 @@ Q *rp;
 			}
 		}
 		return;
+	} else if ( !strcmp(key,"oxpari_id") ) {
+        if ( argc(arg) == 1 ) {
+            if(!ox_pari_stream_initialized) {
+                t=-1;
+                STOQ(t,*rp);
+            }else {
+                *rp = ox_pari_stream;
+            }
+        }else {
+			c = (Q)ARG1(arg);
+			if ( !c || ( NUM(c) && INT(c) && SGN(c)>0 ) ) {
+				ox_pari_stream_initialized = 1;
+				ox_pari_stream = c;
+				*rp = c;
+			}else {
+                t=-1;
+                STOQ(t,*rp);
+			}
+		}
+		return;
+	} else if ( !strcmp(key,"oxpari_start") ) {
+        if ( argc(arg) == 1 ) {
+			*rp = ox_pari_starting_function;
+		} else {
+			f = (Obj)ARG1(arg);
+			if ( !f || OID(f) == O_P) {
+				ox_pari_starting_function = f;
+				*rp = f;
+			}else {
+				*rp = 0;
+			}
+		}
+		return;
 	}
 	for ( i = 0; ctrls[i].key; i++ )
 		if ( !strcmp(key,ctrls[i].key) )
@@ -278,18 +320,31 @@ void Psysinfo(LIST *rp)
 {
     int i;
     NODE n,p;
-    STRING s[6];
+    STRING s[7];
 
     get_sysinfo();
     MKSTR(s[0],sysinfo.type);  MKSTR(s[1],sysinfo.kernel);   MKSTR(s[2],sysinfo.name);
     MKSTR(s[3],sysinfo.arch);  MKSTR(s[4],sysinfo.release);  MKSTR(s[5],sysinfo.full);
-    for(i=5,p=NULL; i>=0; i--,p=n) {
+    MKSTR(s[6],sysinfo.lang);
+    for(i=6,p=NULL; i>=0; i--,p=n) {
         MKNODE(n,s[i],p);
     }
     MKLIST(*rp,n);
 }
 
-#if !defined(VISUAL)
+#if !defined(VISUAL) && !defined(__MINGW32__)
+
+static char *get_lang()
+{
+    char *c, *p, *q;
+    c = setlocale(LC_ALL, NULL); /* saving current locale */
+    p = setlocale(LC_ALL, "");
+    q = (char *)MALLOC(strlen(p)+1);
+    strcpy(q,p);
+    setlocale(LC_ALL, c);        /* restoring current locale */
+    return q;
+}
+
 static char *myuname(char *option)
 {
     char buf[BUFSIZ];
@@ -345,6 +400,7 @@ static void get_sysinfo()
     sysinfo.arch   = u.machine;
     sysinfo.release= u.release;
     sysinfo.full   = myuname("-a");
+    sysinfo.lang   = get_lang();
 }
 
 #else
@@ -384,6 +440,18 @@ static char *osname95(int major, int minor)
     return "unknown";
 }
 
+static char *get_lang()
+{
+    char lang[BUFSIZ];
+    char *s;
+    if(GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SISO639LANGNAME, lang, BUFSIZ)) {
+        s = (char *)MALLOC(strlen(lang)+1);
+        strcpy(s,lang);
+        return s;
+    }
+    return "en"; // English
+}
+
 static void get_sysinfo()
 {
     int arch64 = 0;
@@ -430,6 +498,7 @@ static void get_sysinfo()
     s = (char *)MALLOC(strlen(buf)+1);
     strcpy(s, buf);
     sysinfo.full = s;
+    sysinfo.lang = get_lang();
 }
 
 #endif