=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/file.c,v retrieving revision 1.24 retrieving revision 1.27 diff -u -p -r1.24 -r1.27 --- OpenXM_contrib2/asir2000/builtin/file.c 2006/11/08 07:34:33 1.24 +++ OpenXM_contrib2/asir2000/builtin/file.c 2009/03/13 04:45:15 1.27 @@ -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.23 2006/09/13 02:26:13 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/file.c,v 1.26 2008/11/19 13:12:43 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -65,6 +65,7 @@ /* #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(); @@ -78,12 +79,14 @@ 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 Pfprintf(); void Pimport(); extern int des_encryption; extern char *asir_libdir; struct ftab file_tab[] = { + {"fprintf",Pfprintf,-99999999}, {"purge_stdin",Ppurge_stdin,0}, {"open_file",Popen_file,-2}, {"close_file",Pclose_file,1}, @@ -102,7 +105,7 @@ struct ftab file_tab[] = { {"bsave",Pbsave,2}, {"bload",Pbload,1}, {"get_rootdir",Pget_rootdir,0}, -#if defined(VISUAL) && defined(DES_ENC) +#if defined(DES_ENC) {"bsave_enc",Pbsave_enc,2}, {"bload_enc",Pbload_enc,1}, #endif @@ -116,6 +119,25 @@ struct ftab file_tab[] = { 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); @@ -561,7 +583,7 @@ void Pget_rootdir(STRING *rp) *rp = &rootdir; } -#if defined(VISUAL) && defined(DES_ENC) +#if defined(DES_ENC) void Pbsave_enc(NODE arg,Obj *rp) { init_deskey(); @@ -657,11 +679,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;