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

version 1.14, 2005/10/31 07:50:20 version 1.18, 2020/10/07 10:45:45
Line 1 
Line 1 
 /*$OpenXM: OpenXM/src/kan96xx/plugin/file2.c,v 1.13 2005/07/03 11:08:54 ohara 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 <string.h>
 #include <sys/time.h>  #include <sys/time.h>
Line 6 
Line 6 
 #include <unistd.h>  #include <unistd.h>
 #include <signal.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 21  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 93  void fp2setfp(FILE2 *fp2,FILE *fp,int popened) {
Line 98  void fp2setfp(FILE2 *fp2,FILE *fp,int 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) {
         signal(SIGPIPE,SIG_IGN);          mysignal(SIGPIPE,SIG_IGN);
     r = write(fp2->fd,fp2->writeBuf,fp2->writepos);      r = write(fp2->fd,fp2->writeBuf,fp2->writepos);
         signal(SIGPIPE,SIG_DFL);          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);
Line 139  int fp2fputc(int c,FILE2 *fp2) {
Line 144  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;
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.18
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>