=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v retrieving revision 1.5 retrieving revision 1.14 diff -u -p -r1.5 -r1.14 --- OpenXM_contrib2/asir2000/builtin/file.c 2000/08/22 05:03:57 1.5 +++ OpenXM_contrib2/asir2000/builtin/file.c 2001/08/20 09:03:24 1.14 @@ -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.4 2000/08/21 08:31:19 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.13 2001/03/21 23:49:34 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -57,6 +57,7 @@ #if defined(VISUAL) #include +#include /* #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" @@ -70,26 +71,34 @@ void Pload(), Pwhich(), Ploadfiles(), Poutput(); void Pbsave(), Pbload(), Pbload27(); void Pbsave_compat(), Pbload_compat(); void Pbsave_cmo(), Pbload_cmo(); -void Popen_file(), Pclose_file(), Pget_line(); +void Popen_file(), Pclose_file(), Pget_line(), Pget_byte(), Pput_byte(); +void Ppurge_stdin(); +void Pload_exec(); extern int des_encryption; extern char *asir_libdir; struct ftab file_tab[] = { - {"open_file",Popen_file,1}, + {"purge_stdin",Ppurge_stdin,0}, + {"open_file",Popen_file,-2}, {"close_file",Pclose_file,1}, - {"get_line",Pget_line,1}, + {"get_byte",Pget_byte,1}, + {"put_byte",Pput_byte,2}, + {"get_line",Pget_line,-1}, {"remove_file",Premove_file,1}, {"access",Paccess,1}, {"load",Pload,-1}, + {"load_exec",Pload_exec,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) {"bsave_enc",Pbsave_enc,2}, {"bload_enc",Pbload_enc,1}, +#endif {"bload27",Pbload27,1}, {"bsave_compat",Pbsave_compat,2}, {"bload_compat",Pbload_compat,1}, @@ -100,6 +109,13 @@ struct ftab file_tab[] = { static FILE *file_ptrs[BUFSIZ]; +void Ppurge_stdin(rp) +Q *rp; +{ + purge_stdin(stdin); + *rp = 0; +} + void Popen_file(arg,rp) NODE arg; Q *rp; @@ -114,9 +130,13 @@ Q *rp; if ( i == BUFSIZ ) error("open_file : too many open files"); name = BDY((STRING)ARG0(arg)); - fp = fopen(name,"r"); + if ( argc(arg) == 2 ) { + asir_assert(ARG1(arg),O_STR,"open_file"); + fp = fopen(name,BDY((STRING)ARG1(arg))); + } else + fp = fopen(name,"r"); if ( !fp ) { - sprintf(errbuf,"open_file : \"%s\" not found",name); + sprintf(errbuf,"open_file : cannot open \"%s\"",name); error(errbuf); } file_ptrs[i] = fp; @@ -129,7 +149,7 @@ Q *rp; { int i; - asir_assert(ARG0(arg),O_N,"open_file"); + asir_assert(ARG0(arg),O_N,"close_file"); i = QTOS((Q)ARG0(arg)); if ( file_ptrs[i] ) { fclose(file_ptrs[i]); @@ -147,8 +167,22 @@ STRING *rp; FILE *fp; fpos_t head; char *str; + char buf[BUFSIZ]; - asir_assert(ARG0(arg),O_N,"open_file"); + if ( !arg ) { +#if defined(VISUAL_LIB) + get_string(buf,sizeof(buf)); +#else + fgets(buf,sizeof(buf),stdin); +#endif + i = strlen(buf); + str = (char *)MALLOC_ATOMIC(i+1); + strcpy(str,buf); + MKSTR(*rp,str); + return; + } + + asir_assert(ARG0(arg),O_N,"get_line"); i = QTOS((Q)ARG0(arg)); if ( fp = file_ptrs[i] ) { if ( feof(fp) ) { @@ -178,6 +212,44 @@ STRING *rp; error("get_line : invalid argument"); } +void Pget_byte(arg,rp) +NODE arg; +Q *rp; +{ + int i,c; + FILE *fp; + + asir_assert(ARG0(arg),O_N,"get_byte"); + i = QTOS((Q)ARG0(arg)); + if ( fp = file_ptrs[i] ) { + if ( feof(fp) ) { + STOQ(-1,*rp); + return; + } + c = getc(fp); + STOQ(c,*rp); + } else + error("get_byte : invalid argument"); +} + +void Pput_byte(arg,rp) +NODE arg; +Q *rp; +{ + int i,c; + FILE *fp; + + asir_assert(ARG0(arg),O_N,"put_byte"); + asir_assert(ARG1(arg),O_N,"put_byte"); + i = QTOS((Q)ARG0(arg)); + c = QTOS((Q)ARG1(arg)); + if ( fp = file_ptrs[i] ) { + putc(c,fp); + STOQ(c,*rp); + } else + error("put_byte : invalid argument"); +} + void Pload(arg,rp) NODE arg; Q *rp; @@ -186,11 +258,6 @@ Q *rp; char *name,*name0; char errbuf[BUFSIZ]; -#if defined THINK_C - if ( !arg ) { - ret = finder_loadfile(); - } else -#endif if ( ARG0(arg) ) { switch (OID(ARG0(arg))) { case O_STR: @@ -214,6 +281,22 @@ Q *rp; STOQ(ret,*rp); } +void Pload_exec(arg,rp) +NODE arg; +Q *rp; +{ + int ret = 0; + char *name0,*name; + + name0 = BDY((STRING)ARG0(arg)); + searchasirpath(name0,&name); + if ( !name ) + ret = -1; + else + ret = load_and_execfile(name); + STOQ(ret,*rp); +} + void Pwhich(arg,rp) NODE arg; STRING *rp; @@ -294,11 +377,7 @@ Q *rp; for ( t = vl; t; t = NEXT(t) ) if ( t->v->attr == (pointer)V_UC ) error("bsave : not implemented"); -#if defined(THINK_C) || defined(VISUAL) fp = fopen(BDY((STRING)ARG1(arg)),"wb"); -#else - fp = fopen(BDY((STRING)ARG1(arg)),"w"); -#endif if ( !fp ) error("bsave : invalid filename"); ox_file_io = 1; /* network byte order is used */ @@ -316,11 +395,7 @@ Obj *rp; FILE *fp; asir_assert(ARG0(arg),O_STR,"bload"); -#if defined(THINK_C) || defined(VISUAL) fp = fopen(BDY((STRING)ARG0(arg)),"rb"); -#else - fp = fopen(BDY((STRING)ARG0(arg)),"r"); -#endif if ( !fp ) error("bload : invalid filename"); ox_file_io = 1; /* network byte order is used */ @@ -338,11 +413,7 @@ Q *rp; VL vl,t; asir_assert(ARG1(arg),O_STR,"bsave_cmo"); -#if defined(THINK_C) || defined(VISUAL) fp = fopen(BDY((STRING)ARG1(arg)),"wb"); -#else - fp = fopen(BDY((STRING)ARG1(arg)),"w"); -#endif if ( !fp ) error("bsave_cmo : invalid filename"); ox_file_io = 1; /* network byte order is used */ @@ -359,11 +430,7 @@ Obj *rp; FILE *fp; asir_assert(ARG0(arg),O_STR,"bload_cmo"); -#if defined(THINK_C) || defined(VISUAL) fp = fopen(BDY((STRING)ARG0(arg)),"rb"); -#else - fp = fopen(BDY((STRING)ARG0(arg)),"r"); -#endif if ( !fp ) error("bload_cmo : invalid filename"); ox_file_io = 1; /* network byte order is used */ @@ -372,6 +439,8 @@ Obj *rp; ox_file_io = 0; } +static struct oSTRING rootdir; + #if defined(VISUAL) void get_rootdir(name,len) char *name; @@ -380,7 +449,20 @@ int len; LONG ret; HKEY hOpenKey; DWORD Type; - + char *slash; + + if ( rootdir.body ) { + strcpy(name,rootdir.body); + return; + } + + if ( access("UseCurrentDir",0) >= 0 ) { + GetCurrentDirectory(BUFSIZ,name); + slash = strrchr(name,'\\'); + if ( slash ) + *slash = 0; + return; + } name[0] = 0; ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ECGEN_KEYNAME, 0, KEY_QUERY_VALUE, &hOpenKey); @@ -390,8 +472,27 @@ int len; if( ret == ERROR_SUCCESS ) { RegQueryValueEx(hOpenKey, "Directory", NULL, &Type, name, &len); RegCloseKey(hOpenKey); + } else { + GetCurrentDirectory(len,name); + slash = strrchr(name,'\\'); + if ( slash ) + *slash = 0; } } + +void set_rootdir(name) +char *name; +{ + static char DirName[BUFSIZ]; + + strcpy(DirName,name); + rootdir.id = O_STR; + rootdir.body = DirName; + asir_libdir = DirName; + /* XXX */ + env_init(); +} + #else void get_rootdir(name,len) char *name; @@ -399,12 +500,23 @@ int len; { strcpy(name,asir_libdir); } + +void set_rootdir(name) +char *name; +{ + static char DirName[BUFSIZ]; + + strcpy(DirName,name); + asir_libdir = DirName; + /* XXX */ + env_init(); +} + #endif void Pget_rootdir(rp) STRING *rp; { - static struct oSTRING rootdir; static char DirName[BUFSIZ]; int DirNameLen; @@ -416,6 +528,7 @@ STRING *rp; *rp = &rootdir; } +#if defined(VISUAL) && defined(DES_ENC) void Pbsave_enc(arg,rp) NODE arg; Obj *rp; @@ -435,6 +548,7 @@ Obj *rp; Pbload(arg,rp); des_encryption = 0; } +#endif void Pbload27(arg,rp) NODE arg; @@ -444,11 +558,7 @@ Obj *rp; Obj r; asir_assert(ARG0(arg),O_STR,"bload27"); -#if defined(THINK_C) || defined(VISUAL) fp = fopen(BDY((STRING)ARG0(arg)),"rb"); -#else - fp = fopen(BDY((STRING)ARG0(arg)),"r"); -#endif if ( !fp ) error("bload : invalid filename"); loadvl(fp); @@ -469,11 +579,7 @@ Q *rp; for ( t = vl; t; t = NEXT(t) ) if ( t->v->attr == (pointer)V_UC ) error("bsave : not implemented"); -#if defined(THINK_C) || defined(VISUAL) fp = fopen(BDY((STRING)ARG1(arg)),"wb"); -#else - fp = fopen(BDY((STRING)ARG1(arg)),"w"); -#endif if ( !fp ) error("bsave : invalid filename"); /* indicator of an asir32 file */ @@ -494,11 +600,7 @@ Obj *rp; int c; asir_assert(ARG0(arg),O_STR,"bload_compat"); -#if defined(THINK_C) || defined(VISUAL) fp = fopen(BDY((STRING)ARG0(arg)),"rb"); -#else - fp = fopen(BDY((STRING)ARG0(arg)),"r"); -#endif if ( !fp ) error("bload : invalid filename"); fread(hdr,sizeof(unsigned int),2,fp); @@ -548,3 +650,17 @@ Q *rp; else *rp = 0; } + +#if defined(VISUAL) +int process_id() +{ + return GetCurrentProcessId(); +} + +void call_exe(name,av) +char *name; +char **av; +{ + _spawnv(_P_WAIT,name,av); +} +#endif