[BACK]Return to file2.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / kan96xx / plugin

Diff for /OpenXM/src/kan96xx/plugin/file2.c between version 1.8 and 1.11

version 1.8, 2003/11/24 08:16:13 version 1.11, 2004/12/16 08:42:14
Line 1 
Line 1 
 /*$OpenXM: OpenXM/src/kan96xx/plugin/file2.c,v 1.7 2003/11/23 13:16:30 takayama Exp $ */  /*$OpenXM: OpenXM/src/kan96xx/plugin/file2.c,v 1.10 2004/02/25 23:14:35 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include <sys/time.h>  #include <sys/time.h>
 #include <sys/types.h>  #include <sys/types.h>
 #include <unistd.h>  #include <unistd.h>
   #include <errno.h>
 #include "file2.h"  #include "file2.h"
   
 /* If you use file2 standalone to output string,  /* If you use file2 standalone to output string,
Line 17  or define FORSTRING
Line 18  or define FORSTRING
 #endif  #endif
   
 #ifdef KXX  #ifdef KXX
 #define GC_malloc(n) malloc(n)  #define sGC_malloc(n) malloc(n)
 #else  #else
 void *GC_malloc(int size);  void *sGC_malloc(int size);
 #endif  #endif
 int WatchStream = 0;  int WatchStream = 0;
 /*  Note:  1997, 12/6   cf. SS475/kxx/openxxx.tex, SS475/memo1.txt  /*  Note:  1997, 12/6   cf. SS475/kxx/openxxx.tex, SS475/memo1.txt
Line 49  FILE2 *fp2open(int fd) {
Line 50  FILE2 *fp2open(int fd) {
   if (debug1) {    if (debug1) {
     printf("fp2open is called. \n");      printf("fp2open is called. \n");
   }    }
   fp2 = (FILE2 *) GC_malloc(sizeof(FILE2));    fp2 = (FILE2 *) sGC_malloc(sizeof(FILE2));
   if (fd < -1) {    if (fd < -1) {
     fprintf(stderr,"fp2open  Invalid file descriptor %d\n",fd);      fprintf(stderr,"fp2open  Invalid file descriptor %d\n",fd);
     return(NULL);      return(NULL);
Line 66  FILE2 *fp2open(int fd) {
Line 67  FILE2 *fp2open(int fd) {
   fp2->readsize = 0;    fp2->readsize = 0;
   fp2->writepos = 0;    fp2->writepos = 0;
   fp2->limit = FILE2BSIZE;    fp2->limit = FILE2BSIZE;
   fp2->readBuf = (char *) GC_malloc(FILE2BSIZE);    fp2->readBuf = (char *) sGC_malloc(FILE2BSIZE);
   fp2->writeBuf = (char *) GC_malloc(FILE2BSIZE);    fp2->writeBuf = (char *) sGC_malloc(FILE2BSIZE);
   if ((fp2->readBuf == NULL) || (fp2->writeBuf == NULL)) {    if ((fp2->readBuf == NULL) || (fp2->writeBuf == NULL)) {
         fprintf(stderr,"fp2open. No more memory.\n");          fprintf(stderr,"fp2open. No more memory.\n");
         return(NULL);          return(NULL);
Line 77  FILE2 *fp2open(int fd) {
Line 78  FILE2 *fp2open(int fd) {
   fp2->mathcapList = NULL;    fp2->mathcapList = NULL;
   fp2->log_incomming = NULL;    fp2->log_incomming = NULL;
   fp2->log_outgoing = NULL;    fp2->log_outgoing = NULL;
     fp2->popened = 0;
     fp2->pfp = NULL;
   return(fp2);    return(fp2);
 }  }
   
   void fp2setfp(FILE2 *fp2,FILE *fp,int popened) {
     fp2->pfp = fp;
     fp2->popened = popened;
   }
   
 int fp2fflush(FILE2 *fp2) {  int fp2fflush(FILE2 *fp2) {
   int r;    int r;
Line 111  int fp2fclose(FILE2 *fp2) {
Line 118  int fp2fclose(FILE2 *fp2) {
     fprintf(stderr,"fp2fclose: flush error.\n");      fprintf(stderr,"fp2fclose: flush error.\n");
     return(-1);      return(-1);
   }    }
   return(close(fp2->fd));    if (fp2->pfp != NULL) {
           if (fp2->popened) {
         return pclose(fp2->pfp);
           } else return fclose(fp2->pfp);
     }
     else return(close(fp2->fd));
 }  }
   
 int fp2fputc(int c,FILE2 *fp2) {  int fp2fputc(int c,FILE2 *fp2) {
Line 224  int fp2dumpBuffer(FILE2 *fp2) {
Line 236  int fp2dumpBuffer(FILE2 *fp2) {
 int fp2clearReadBuf(FILE2 *fp2) {  int fp2clearReadBuf(FILE2 *fp2) {
   fd_set readfds;    fd_set readfds;
   struct timeval timeout;    struct timeval timeout;
   extern int errno;  
   int fd;    int fd;
 #define TMP00SIZE  2000  #define TMP00SIZE  2000
   char tmp00[TMP00SIZE];    char tmp00[TMP00SIZE];
Line 329  static int fp2fputcString(int c,FILE2 *fp2) {
Line 340  static int fp2fputcString(int c,FILE2 *fp2) {
         return(-1);          return(-1);
   }    }
   newsize = (fp2->limit)*2;    newsize = (fp2->limit)*2;
   newwrite = (char *)GC_malloc(newsize);    newwrite = (char *)sGC_malloc(newsize);
   newread = (char *)GC_malloc(newsize);    newread = (char *)sGC_malloc(newsize);
   if ((newwrite == NULL) || (newread == NULL)) {    if ((newwrite == NULL) || (newread == NULL)) {
         fprintf(stderr,"fp2fputcString: No more memory.\n");          fprintf(stderr,"fp2fputcString: No more memory.\n");
         return(-1);          return(-1);
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.11
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>