=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v retrieving revision 1.20 retrieving revision 1.30 diff -u -p -r1.20 -r1.30 --- OpenXM_contrib2/asir2000/builtin/file.c 2004/04/26 05:28:40 1.20 +++ OpenXM_contrib2/asir2000/builtin/file.c 2014/04/02 22:08:29 1.30 @@ -45,7 +45,7 @@ * 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.19 2003/11/12 07:48:50 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.29 2013/08/20 14:22:33 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -65,9 +65,11 @@ /* #define ECGEN_KEYNAME "SoftWare\\Fujitsu\\WinECgen\\1.00.000" */ #define ECGEN_KEYNAME "SoftWare\\Fujitsu\\FSEcParamGen\\V1.0L10" #define ASIR_KEYNAME "SoftWare\\Fujitsu\\Asir\\1999.03.31" +#define R_OK 0x04 #endif void Pget_rootdir(); +void Pget_asirloadpath(); void Paccess(),Premove_file(); void Pbsave_enc(), Pbload_enc(); @@ -76,30 +78,38 @@ void Pbsave(), Pbload(), Pbload27(); void Pbsave_compat(), Pbload_compat(); void Pbsave_cmo(), Pbload_cmo(); void Popen_file(), Pclose_file(), Pget_line(), Pget_byte(), Pput_byte(); +void Pput_word(), Pget_word(); void Ppurge_stdin(); -void Pexec(); +void Pfprintf(); +void Pimport(); +void Pgetpid(); extern int des_encryption; extern char *asir_libdir; +extern char **ASIRLOADPATH; struct ftab file_tab[] = { + {"fprintf",Pfprintf,-99999999}, {"purge_stdin",Ppurge_stdin,0}, {"open_file",Popen_file,-2}, {"close_file",Pclose_file,1}, {"get_byte",Pget_byte,1}, {"put_byte",Pput_byte,2}, + {"get_word",Pget_word,1}, + {"put_word",Pput_word,2}, {"get_line",Pget_line,-1}, {"remove_file",Premove_file,1}, {"access",Paccess,1}, {"load",Pload,-1}, - {"exec",Pexec,1}, + {"import",Pimport,-1}, {"which",Pwhich,1}, {"loadfiles",Ploadfiles,1}, {"output",Poutput,-1}, {"bsave",Pbsave,2}, {"bload",Pbload,1}, {"get_rootdir",Pget_rootdir,0}, -#if defined(VISUAL) && defined(DES_ENC) + {"get_asirloadpath",Pget_asirloadpath,0}, +#if defined(DES_ENC) {"bsave_enc",Pbsave_enc,2}, {"bload_enc",Pbload_enc,1}, #endif @@ -108,11 +118,31 @@ struct ftab file_tab[] = { {"bload_compat",Pbload_compat,1}, {"bsave_cmo",Pbsave_cmo,2}, {"bload_cmo",Pbload_cmo,1}, + {"getpid",Pgetpid,0}, {0,0,0}, }; static FILE *file_ptrs[BUFSIZ]; +void Pfprintf(NODE arg,pointer *rp) +{ + FILE *fp; + STRING s; + asir_assert(ARG0(arg),O_N,"fprintf"); + fp = file_ptrs[QTOS((Q)ARG0(arg))]; + if ( !fp ) { + error("fprintf : invalid argument"); + } + arg = NEXT(arg); + if ( arg ) { + Psprintf(arg,&s); + fputs(BDY(s),fp); + /* fflush(fp); */ + } + *rp = 0; + return; +} + void Ppurge_stdin(Q *rp) { purge_stdin(stdin); @@ -235,6 +265,24 @@ void Pget_byte(NODE arg,Q *rp) error("get_byte : invalid argument"); } +void Pget_word(NODE arg,Q *rp) +{ + int i,c; + FILE *fp; + + asir_assert(ARG0(arg),O_N,"get_word"); + i = QTOS((Q)ARG0(arg)); + if ( fp = file_ptrs[i] ) { + if ( feof(fp) ) { + error("get_word : end of file"); + return; + } + read_int(fp,&c); + STOQ(c,*rp); + } else + error("get_word : invalid argument"); +} + void Pput_byte(NODE arg,Obj *rp) { int i,j,c; @@ -261,12 +309,31 @@ void Pput_byte(NODE arg,Obj *rp) *rp = obj; } +void Pput_word(NODE arg,Obj *rp) +{ + int i,c; + FILE *fp; + Obj obj; + + asir_assert(ARG0(arg),O_N,"put_word"); + asir_assert(ARG1(arg),O_N,"put_word"); + i = QTOS((Q)ARG0(arg)); + if ( !(fp = file_ptrs[i]) ) + error("put_word : invalid argument"); + + obj = (Q)ARG1(arg); + c = QTOS((Q)obj); + write_int(fp,&c); + *rp = obj; +} + void Pload(NODE arg,Q *rp) { int ret = 0; char *name,*name0; char errbuf[BUFSIZ]; + if ( !arg ) error("load : invalid argument"); if ( ARG0(arg) ) { switch (OID(ARG0(arg))) { case O_STR: @@ -276,11 +343,7 @@ void Pload(NODE arg,Q *rp) sprintf(errbuf,"load : \"%s\" not found in the search path",name0); error(errbuf); } - ret = loadfile(name); - if ( !ret ) { - sprintf(errbuf,"load : \"%s\" could not be loaded",name); - error(errbuf); - } + execasirfile(name); break; default: error("load : invalid argument"); @@ -290,20 +353,31 @@ void Pload(NODE arg,Q *rp) STOQ(ret,*rp); } -void Pexec(NODE arg,Q *rp) +NODE imported_files; + +void Pimport(NODE arg,Q *rp) { - int ret; - char *name0,*name; + char *name; + NODE t,p,opt; - name0 = BDY((STRING)ARG0(arg)); - searchasirpath(name0,&name); - if ( !name ) - ret = -1; - else { - execasirfile(name); - ret = 0; + name = BDY((STRING)ARG0(arg)); + for ( t = imported_files; t; t = NEXT(t) ) + if ( !strcmp((char *)BDY(t),name) ) break; + if ( !t ) { + Pload(arg,rp); + MKNODE(t,name,imported_files); + imported_files = t; + return; + } else if ( current_option ) { + for ( opt = current_option; opt; opt = NEXT(opt) ) { + p = BDY((LIST)BDY(opt)); + if ( !strcmp(BDY((STRING)BDY(p)),"reimport") && BDY(NEXT(p)) ) { + Pload(arg,rp); + return; + } + } } - STOQ(ret,*rp); + *rp = 0; } void Pwhich(NODE arg,STRING *rp) @@ -447,11 +521,11 @@ void get_rootdir(char *name,int len) strcpy(name,rootdir.body); return; } - - if ( access("UseCurrentDir",0) >= 0 ) { - GetCurrentDirectory(BUFSIZ,name); + if ( GetModuleFileName(NULL,name,BUFSIZ) ) { slash = strrchr(name,'\\'); - if ( slash ) + *slash = 0; + slash = strrchr(name,'\\'); + if ( slash ) *slash = 0; return; } @@ -514,7 +588,38 @@ void Pget_rootdir(STRING *rp) *rp = &rootdir; } -#if defined(VISUAL) && defined(DES_ENC) +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) + id = GetCurrentProcessId(); +#else + id = getpid(); +#endif + STOQ(id,*rp); +} + +#if defined(DES_ENC) void Pbsave_enc(NODE arg,Obj *rp) { init_deskey(); @@ -610,11 +715,7 @@ void Premove_file(NODE arg,Q *rp) void Paccess(NODE arg,Q *rp) { -#if defined(VISUAL) - if ( access(BDY((STRING)ARG0(arg)),04) >= 0 ) -#else if ( access(BDY((STRING)ARG0(arg)),R_OK) >= 0 ) -#endif *rp = ONE; else *rp = 0;