=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v retrieving revision 1.30 retrieving revision 1.33 diff -u -p -r1.30 -r1.33 --- OpenXM_contrib2/asir2000/builtin/file.c 2014/04/02 22:08:29 1.30 +++ OpenXM_contrib2/asir2000/builtin/file.c 2015/08/06 10:01:51 1.33 @@ -45,20 +45,20 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.29 2013/08/20 14:22:33 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.32 2015/03/15 19:31:30 ohara Exp $ */ #include "ca.h" #include "parse.h" #include "ox.h" #include "base.h" -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) #include "unistd.h" #endif #if defined(PARI) #include "genpari.h" #endif -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) #include #include #include @@ -68,8 +68,9 @@ #define R_OK 0x04 #endif +void Psprintf(NODE,STRING *); + void Pget_rootdir(); -void Pget_asirloadpath(); void Paccess(),Premove_file(); void Pbsave_enc(), Pbload_enc(); @@ -86,7 +87,6 @@ void Pgetpid(); extern int des_encryption; extern char *asir_libdir; -extern char **ASIRLOADPATH; struct ftab file_tab[] = { {"fprintf",Pfprintf,-99999999}, @@ -108,7 +108,6 @@ struct ftab file_tab[] = { {"bsave",Pbsave,2}, {"bload",Pbload,1}, {"get_rootdir",Pget_rootdir,0}, - {"get_asirloadpath",Pget_asirloadpath,0}, #if defined(DES_ENC) {"bsave_enc",Pbsave_enc,2}, {"bload_enc",Pbload_enc,1}, @@ -509,7 +508,7 @@ void Pbload_cmo(NODE arg,Obj *rp) static struct oSTRING rootdir; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) void get_rootdir(char *name,int len) { LONG ret; @@ -588,30 +587,11 @@ void Pget_rootdir(STRING *rp) *rp = &rootdir; } -void Pget_asirloadpath(LIST *rp) -{ - STRING s; - int i; - NODE t,prev; - if( ASIRLOADPATH[0] == NULL ) { - *rp = NULL; - return; - } - for(i=0; ASIRLOADPATH[i]; i++) { - } - for(t=0,i--; i>=0; i--) { - prev=t; - MKSTR(s,ASIRLOADPATH[i]); - MKNODE(t,s,prev); - } - MKLIST(*rp,t); -} - void Pgetpid(Q *rp) { int id; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) id = GetCurrentProcessId(); #else id = getpid(); @@ -721,7 +701,7 @@ void Paccess(NODE arg,Q *rp) *rp = 0; } -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) int process_id() { return GetCurrentProcessId();