=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v retrieving revision 1.42 retrieving revision 1.53 diff -u -p -r1.42 -r1.53 --- OpenXM_contrib2/asir2000/builtin/ctrl.c 2014/05/13 15:02:28 1.42 +++ OpenXM_contrib2/asir2000/builtin/ctrl.c 2017/08/31 02:36:20 1.53 @@ -45,18 +45,21 @@ * 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.41 2014/05/12 02:35:35 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.52 2016/08/26 04:56:07 takayama Exp $ */ #include "ca.h" #include "parse.h" #include -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) #include +#include #else +#include #include #include #include #include +#include #endif static struct { @@ -66,6 +69,7 @@ static struct { char *arch; char *release; char *full; + char *lang; } sysinfo; void Pctrl(); @@ -80,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; @@ -108,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; @@ -117,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}, @@ -148,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}, @@ -155,9 +161,7 @@ static struct { {0,0}, }; -void Pctrl(arg,rp) -NODE arg; -Q *rp; +void Pctrl(NODE arg,Q *rp) { int t,i,n; int nm,dv; @@ -169,6 +173,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; @@ -233,7 +241,7 @@ Q *rp; MKNODE(node,s,p); } MKLIST(list,node); - *rp = list; + *rp = (Q)list; } } else { list = (LIST)ARG1(arg); @@ -257,6 +265,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 = (Q)ox_pari_starting_function; + } else { + f = (P)ARG1(arg); + if ( !f || OID(f) == O_P) { + ox_pari_starting_function = f; + *rp = (Q)f; + }else { + *rp = 0; + } + } + return; } for ( i = 0; ctrls[i].key; i++ ) if ( !strcmp(key,ctrls[i].key) ) @@ -277,36 +318,56 @@ 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) -static char *uname(char *option) +#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]; char *s; - int fd[2], status; + int fd[2], status, pid; *buf = 0; if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) { - *buf = 0; return ""; + *buf = 0; return NULL; } - if (fork() == 0) { + pid = fork(); + if (pid < 0) { + return NULL; + }else if (pid == 0) { dup2(fd[1], 1); + close(2); execlp("uname", "uname", option, NULL); } + waitpid(pid, &status, 0); + if (status) { /* error */ + return NULL; + } s = buf; if( !read(fd[0], s, BUFSIZ-1) || (s = strchr(s, '\n')) ) { *s = 0; } - wait(&status); close(fd[0]); close(fd[1]); s = (char *)MALLOC(strlen(buf)+1); @@ -316,22 +377,28 @@ static char *uname(char *option) static void get_sysinfo() { + static struct utsname u; static int initialized = 0; if (initialized) { return; } initialized = 1; - sysinfo.kernel = uname(NULL); + uname(&u); + sysinfo.kernel = u.sysname; #if defined(__DARWIN__) sysinfo.type = "macosx"; sysinfo.name = sysinfo.kernel; #else sysinfo.type = "unix"; - sysinfo.name = uname("-o"); // not work on Darwin + sysinfo.name = myuname("-o"); // not work on Darwin + if (!sysinfo.name) { + sysinfo.name = sysinfo.kernel; + } #endif - sysinfo.arch = uname("-m"); - sysinfo.release= uname("-r"); - sysinfo.full = uname("-a"); + sysinfo.arch = u.machine; + sysinfo.release= u.release; + sysinfo.full = myuname("-a"); + sysinfo.lang = get_lang(); } #else @@ -371,6 +438,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; @@ -417,6 +496,7 @@ static void get_sysinfo() s = (char *)MALLOC(strlen(buf)+1); strcpy(s, buf); sysinfo.full = s; + sysinfo.lang = get_lang(); } #endif