=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/file2.h,v retrieving revision 1.3 retrieving revision 1.6 diff -u -p -r1.3 -r1.6 --- OpenXM/src/kan96xx/plugin/file2.h 2003/11/17 05:45:47 1.3 +++ OpenXM/src/kan96xx/plugin/file2.h 2004/12/16 08:42:14 1.6 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kan96xx/plugin/file2.h,v 1.2 2000/01/16 07:55:47 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kan96xx/plugin/file2.h,v 1.5 2003/11/24 08:16:13 takayama Exp $ */ /* file2.h */ #define MAGIC2 "Buffered IO by FILE2" @@ -8,8 +8,8 @@ typedef struct FILE2 { int fd; int initialized; - unsigned char readBuf[FILE2BSIZE]; - unsigned char writeBuf[FILE2BSIZE]; + unsigned char *readBuf; + unsigned char *writeBuf; int readpos; int readsize; int writepos; @@ -19,12 +19,16 @@ typedef struct FILE2 { void *mathcapList; /* pointer to struct object */ FILE *log_incomming; FILE *log_outgoing; + int popened; /* 1 => popen, 0 => fopen etc ... */ + FILE *pfp; /* used for pclose */ } FILE2 ; FILE2 *fp2open(int fd); int fp2fflush(FILE2 *fp); int fp2fclose(FILE2 *fp); +char *fp2fcloseInString(FILE2 *fp2, int *sizep); int fp2fputc(int c,FILE2 *fp); +int fp2fputs(char *s,FILE2 *fp); int fp2fgetc(FILE2 *fp); int fp2select(FILE2 *fp2, int t); int fp2dumpBuffer(FILE2 *fp); @@ -34,7 +38,7 @@ int fp2watch(FILE2 *fp,FILE *log); int fp2stopWatch(FILE2 *fp); int fp2log(FILE2 *fp,FILE *incomming,FILE *outgoing); int fp2stopLog(FILE2 *fp); - +void fp2setfp(FILE2 *fp2, FILE *fp,int popened);