=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/file2.c,v retrieving revision 1.4 retrieving revision 1.10 diff -u -p -r1.4 -r1.10 --- OpenXM/src/kan96xx/plugin/file2.c 2001/05/04 01:06:30 1.4 +++ OpenXM/src/kan96xx/plugin/file2.c 2004/02/25 23:14:35 1.10 @@ -1,14 +1,26 @@ -/*$OpenXM: OpenXM/src/kan96xx/plugin/file2.c,v 1.3 1999/11/18 23:57:19 takayama Exp $ */ +/*$OpenXM: OpenXM/src/kan96xx/plugin/file2.c,v 1.9 2004/02/23 09:03:43 takayama Exp $ */ #include #include #include #include +#include #include "file2.h" +/* If you use file2 standalone to output string, + make the following dummy definition; +int KsocketSelect0(int a,int b) { return(0); } +int oxSocketSelect0(int a,int b) { return(0); } +or define FORSTRING +*/ +#ifdef FORSTRING +#define KsocketSelect0(a,b) 0 +#define oxSocketSelect0(a,b) 0 +#endif + #ifdef KXX -#define GC_malloc(n) malloc(n) +#define sGC_malloc(n) malloc(n) #else -void *GC_malloc(int size); +void *sGC_malloc(int size); #endif int WatchStream = 0; /* Note: 1997, 12/6 cf. SS475/kxx/openxxx.tex, SS475/memo1.txt @@ -19,6 +31,7 @@ int WatchStream = 0; static int debug1 = 0; static int checkfp2(FILE2 *fp2,char *s); +static int fp2fputcString(int c,FILE2 *fp2); static int checkfp2(FILE2 *fp2,char *s) { if (fp2 == NULL) { @@ -37,11 +50,12 @@ FILE2 *fp2open(int fd) { if (debug1) { printf("fp2open is called. \n"); } - fp2 = (FILE2 *) GC_malloc(sizeof(FILE2)); - if (fd < 0) { + fp2 = (FILE2 *) sGC_malloc(sizeof(FILE2)); + if (fd < -1) { fprintf(stderr,"fp2open Invalid file descriptor %d\n",fd); return(NULL); } + /* fd == -1 ==> store in string. */ if (fp2 == NULL) { fprintf(stderr,"fp2open. No memory.\n"); return(NULL); @@ -53,9 +67,17 @@ FILE2 *fp2open(int fd) { fp2->readsize = 0; fp2->writepos = 0; fp2->limit = FILE2BSIZE; + fp2->readBuf = (char *) sGC_malloc(FILE2BSIZE); + fp2->writeBuf = (char *) sGC_malloc(FILE2BSIZE); + if ((fp2->readBuf == NULL) || (fp2->writeBuf == NULL)) { + fprintf(stderr,"fp2open. No more memory.\n"); + return(NULL); + } fp2->watch = 0; fp2->watchFile = NULL; fp2->mathcapList = NULL; + fp2->log_incomming = NULL; + fp2->log_outgoing = NULL; return(fp2); } @@ -68,6 +90,7 @@ int fp2fflush(FILE2 *fp2) { printf("--------------------------\n"); } if (checkfp2(fp2,"fp2fflush ") == -1) return(-1); + if (fp2->fd == -1) return(0); if (fp2->writepos > 0) { r = write(fp2->fd,fp2->writeBuf,fp2->writepos); fp2->writepos = 0; @@ -83,6 +106,7 @@ int fp2fflush(FILE2 *fp2) { int fp2fclose(FILE2 *fp2) { int r; if (checkfp2(fp2," fp2fclose ") == -1) return(-1); + if (fp2->fd == -1) return(0); r = fp2fflush(fp2); if (r < 0) { fprintf(stderr,"fp2fclose: flush error.\n"); @@ -100,6 +124,7 @@ int fp2fputc(int c,FILE2 *fp2) { if (fp2->watch || WatchStream) { if (fp2->watch) fp = fp2->watchFile; else fp = stderr; + fprintf(stderr,"put to <%x> ",fp2->fd); /* output the channel for debug */ if (c >= ' ' && c <='z') { fprintf(fp," %2x(%c)-> ",c& 0xff,c); }else{ @@ -107,9 +132,11 @@ int fp2fputc(int c,FILE2 *fp2) { } fflush(NULL); } + if (fp2->log_outgoing != NULL) fputc(c,fp2->log_outgoing); if (checkfp2(fp2," fp2fputc ") == -1) return(-1); (fp2->writeBuf)[fp2->writepos] = c; (fp2->writepos)++; + if (fp2->fd == -1) return(fp2fputcString(c,fp2)); if (fp2->writepos < fp2->limit) { return(c); }else{ @@ -129,6 +156,7 @@ int fp2fgetc(FILE2 *fp2) { if (fp2->watch || WatchStream) { if (fp2->watch) fp = fp2->watchFile; else fp = stderr; + fprintf(fp,"get from <%x> ",fp2->fd); /* output the channel for debug*/ if (c >= ' ' && c <= 'z') { fprintf(fp," %2x(%c) ",c,c); }else{ @@ -136,8 +164,10 @@ int fp2fgetc(FILE2 *fp2) { } fflush(NULL); } + if (fp2->log_incomming != NULL) fputc(c,fp2->log_incomming); return(c); }else{ + if (fp2->fd == -1) return(-1); fp2->readpos = 0; fp2 ->readsize = read(fp2->fd, fp2->readBuf, fp2->limit); @@ -157,6 +187,10 @@ int fp2fgetc(FILE2 *fp2) { } int fp2select(FILE2 *fp2, int t) { + if (fp2->fd == -1) { + if (fp2->readpos < fp2->readsize) return(1); + else return(0); + } if (fp2->readpos < fp2->readsize) return(1); else { #ifdef KXX @@ -191,7 +225,6 @@ int fp2dumpBuffer(FILE2 *fp2) { int fp2clearReadBuf(FILE2 *fp2) { fd_set readfds; struct timeval timeout; - extern int errno; int fd; #define TMP00SIZE 2000 char tmp00[TMP00SIZE]; @@ -200,6 +233,7 @@ int fp2clearReadBuf(FILE2 *fp2) { if (checkfp2(fp2," fp2clearReadBuf ") == -1) { return(-1); } + if (fp2->fd == -1) return(0); fp2->readsize=0; fp2->readpos = 0; /* Clear the buffer. */ @@ -271,3 +305,82 @@ int fp2stopWatch(FILE2 *fp2) } } +int fp2log(FILE2 *fp,FILE *incomming,FILE *outgoing) { + fp->log_incomming = incomming; + fp->log_outgoing = outgoing; + return 0; +} +int fp2stopLog(FILE2 *fp) { + if (fp->log_incomming != NULL) fclose(fp->log_incomming); + if (fp->log_outgoing != NULL) fclose(fp->log_outgoing); + fp->log_incomming = fp->log_outgoing = NULL; + return 0; +} + +static int fp2fputcString(int c,FILE2 *fp2) { + unsigned char *newwrite,*newread; + int newsize; + int i; + (fp2->readBuf)[fp2->readsize] = c; + (fp2->readsize)++; + if ((fp2->writepos < fp2->limit) && (fp2->readsize < fp2->limit)) return(c); + if ((fp2->limit)*2 >=0x3000000) { + fprintf(stderr,"Too big output string.\n"); + return(-1); + } + newsize = (fp2->limit)*2; + newwrite = (char *)sGC_malloc(newsize); + newread = (char *)sGC_malloc(newsize); + if ((newwrite == NULL) || (newread == NULL)) { + fprintf(stderr,"fp2fputcString: No more memory.\n"); + return(-1); + } + for (i=0; iwritepos; i++) { + newwrite[i] = fp2->writeBuf[i]; + } + for (i=0; ireadsize; i++) { + newread[i] = fp2->readBuf[i]; + } + fp2->writeBuf = newwrite; + fp2->readBuf = newread; + fp2->limit = newsize; + return(c); +} + +char *fp2fcloseInString(FILE2 *fp2, int *sizep) +{ + if (fp2->fd == -1) { + fp2fputc(0,fp2); + *sizep = fp2->writepos-1; + return(fp2->writeBuf); + }else{ + fprintf(stderr,"fp2fcloseInString is called for a file stream that is not associated to a string.\n"); + } +} + +int fp2fputs(char *s,FILE2 *fp) { + int i,n; + n = strlen(s); + for (i=0; i