[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.10 and 1.18

version 1.10, 2004/02/25 23:14:35 version 1.18, 2020/10/07 10:45:45
Line 1 
Line 1 
 /*$OpenXM: OpenXM/src/kan96xx/plugin/file2.c,v 1.9 2004/02/23 09:03:43 takayama Exp $ */  /*$OpenXM: OpenXM/src/kan96xx/plugin/file2.c,v 1.17 2020/10/06 11:33:47 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
   #include <string.h>
 #include <sys/time.h>  #include <sys/time.h>
 #include <sys/types.h>  #include <sys/types.h>
 #include <unistd.h>  #include <unistd.h>
   #include <signal.h>
 #include <errno.h>  #include <errno.h>
   #include <stdlib.h>
 #include "file2.h"  #include "file2.h"
   #include "mysig.h"
   #include "sm1Socket.h"
   
 /* If you use file2 standalone to output string,  /* If you use file2 standalone to output string,
     make the following dummy definition;      make the following dummy definition;
 int KsocketSelect0(int a,int b) { return(0); }  int KsocketSelect0(int a,int b) { return(0); }
 int oxSocketSelect0(int a,int b) { return(0); }  int oxSocketSelect0(int a,int b) { return(0); }
 or define FORSTRING  or define FORSTRING
   Real oxSocketSelect0 is defined in kan96xx/plugin/mytcpio.c
 */  */
 #ifdef  FORSTRING  #ifdef  FORSTRING
 #define KsocketSelect0(a,b) 0  #define KsocketSelect0(a,b) 0
Line 19  or define FORSTRING
Line 25  or define FORSTRING
   
 #ifdef KXX  #ifdef KXX
 #define sGC_malloc(n) malloc(n)  #define sGC_malloc(n) malloc(n)
   int oxSocketSelect0(int fd,int t);
 #else  #else
 void *sGC_malloc(int size);  void *sGC_malloc(int size);
 #endif  #endif
Line 78  FILE2 *fp2open(int fd) {
Line 85  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;
   if (debug1) {    if (debug1) {
     printf("fp2fflush is called with FILE2 *%x.\n", (int )fp2);      printf("fp2fflush is called with FILE2 *%lx.\n", (long)fp2);
     fp2dumpBuffer(fp2);      fp2dumpBuffer(fp2);
     printf("--------------------------\n");      printf("--------------------------\n");
   }    }
   if (checkfp2(fp2,"fp2fflush ") == -1) return(-1);    if (checkfp2(fp2,"fp2fflush ") == -1) return(-1);
   if (fp2->fd == -1) return(0);    if (fp2->fd == -1) return(0);
   if (fp2->writepos > 0) {    if (fp2->writepos > 0) {
           mysignal(SIGPIPE,SIG_IGN);
     r = write(fp2->fd,fp2->writeBuf,fp2->writepos);      r = write(fp2->fd,fp2->writeBuf,fp2->writepos);
           mysignal(SIGPIPE,SIG_DFL);
     fp2->writepos = 0;      fp2->writepos = 0;
     if (r <= 0) {      if (r <= 0) {
       fprintf(stderr,"fp2fflush(): write failed on %d.\n",fp2->fd);        fprintf(stderr,"fp2fflush(): write failed on %d.\n",fp2->fd);
             if (errno == EPIPE) {
                   fprintf(stderr,"Your peer is closed --- SIGPIPE. Closing this fp2.\n");
                   fp2fclose(fp2);
                   return r;
             }
     }      }
     return(r);      return(r);
   }else{    }else{
Line 112  int fp2fclose(FILE2 *fp2) {
Line 132  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) {
   FILE *fp;    FILE *fp;
   if (debug1) {    if (debug1) {
     printf("fp2fputc is called with %2x, fp2->writepos=%d, ",c,fp2->writepos);      printf("fp2fputc is called with %2x, fp2->writepos=%d, ",c,fp2->writepos);
     printf("fp2 = %x.\n",(int) fp2);      printf("fp2 = %lx.\n",(long) fp2);
   }    }
   if (fp2->watch || WatchStream) {    if (fp2->watch || WatchStream) {
     if (fp2->watch) fp = fp2->watchFile;      if (fp2->watch) fp = fp2->watchFile;
Line 265  int fp2clearReadBuf(FILE2 *fp2) {
Line 290  int fp2clearReadBuf(FILE2 *fp2) {
 int fp2write(FILE2 *os, char *data, int size) {  int fp2write(FILE2 *os, char *data, int size) {
   int i,r;    int i,r;
   for (i=0; i<size; i++) {    for (i=0; i<size; i++) {
     r = fp2fputc(data[i],os);      r = fp2fputc((unsigned char)(data[i]),os);
   }    }
   return(r);    return(r);
 }  }
Line 362  int fp2fputs(char *s,FILE2 *fp) {
Line 387  int fp2fputs(char *s,FILE2 *fp) {
   int i,n;    int i,n;
   n = strlen(s);    n = strlen(s);
   for (i=0; i<n; i++) {    for (i=0; i<n; i++) {
         if (fp2fputc(s[i],fp) < 0) return(-1);          if (fp2fputc((unsigned char)(s[i]),fp) < 0) return(-1);
   }    }
   return(0);    return(0);
 }  }
Line 384  int fp2fputs(char *s,FILE2 *fp) {
Line 409  int fp2fputs(char *s,FILE2 *fp) {
     ....      ....
  }   }
 */  */
   

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.18

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>