===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/file2.c,v
retrieving revision 1.10
retrieving revision 1.16
diff -u -p -r1.10 -r1.16
--- OpenXM/src/kan96xx/plugin/file2.c	2004/02/25 23:14:35	1.10
+++ OpenXM/src/kan96xx/plugin/file2.c	2016/03/31 03:22:55	1.16
@@ -1,10 +1,14 @@
-/*$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.15 2015/10/10 11:29:46 takayama Exp $ */
 #include <stdio.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <signal.h>
 #include <errno.h>
+#include <stdlib.h>
 #include "file2.h"
+#include "mysig.h"
 
 /* If you use file2 standalone to output string,  
     make the following dummy definition;
@@ -78,9 +82,15 @@ FILE2 *fp2open(int fd) {
   fp2->mathcapList = NULL;
   fp2->log_incomming = NULL;
   fp2->log_outgoing = NULL;
+  fp2->popened = 0;
+  fp2->pfp = NULL;
   return(fp2);
 }
 
+void fp2setfp(FILE2 *fp2,FILE *fp,int popened) {
+  fp2->pfp = fp;
+  fp2->popened = popened;
+}
     
 int fp2fflush(FILE2 *fp2) {
   int r;
@@ -92,10 +102,17 @@ int fp2fflush(FILE2 *fp2) {
   if (checkfp2(fp2,"fp2fflush ") == -1) return(-1);
   if (fp2->fd == -1) return(0);
   if (fp2->writepos > 0) {
+	mysignal(SIGPIPE,SIG_IGN);
     r = write(fp2->fd,fp2->writeBuf,fp2->writepos);
+	mysignal(SIGPIPE,SIG_DFL);
     fp2->writepos = 0;
     if (r <= 0) {
       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);
   }else{
@@ -112,7 +129,12 @@ int fp2fclose(FILE2 *fp2) {
     fprintf(stderr,"fp2fclose: flush error.\n");
     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) {
@@ -265,7 +287,7 @@ int fp2clearReadBuf(FILE2 *fp2) {
 int fp2write(FILE2 *os, char *data, int size) {
   int i,r;
   for (i=0; i<size; i++) {
-    r = fp2fputc(data[i],os);
+    r = fp2fputc((unsigned char)(data[i]),os);
   }
   return(r);
 }
@@ -362,7 +384,7 @@ int fp2fputs(char *s,FILE2 *fp) {
   int i,n;
   n = strlen(s);
   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);
 }
@@ -384,3 +406,4 @@ int fp2fputs(char *s,FILE2 *fp) {
     ....
  }
 */
+