X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=b178e75955a5944a0d226366e0894ae625b9c0a2;hp=44cbf0d422896030c28d1fe5b859707c2394ea5f;hb=81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 44cbf0d..b178e75 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -3,13 +3,18 @@
  * scansbr.c -- routines to help scan along...
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
+#include <h/utils.h>
 
 #ifdef _FSTDIO
 # define _ptr _p                /* Gag    */
@@ -50,9 +55,11 @@ static int dat[5];			/* aux. data for format routine    */
 
 char *scanl = 0;			/* text of most recent scanline    */
 
+#define DIEWRERR() adios (scnmsg, "write error on")
+
 #define FPUTS(buf) {\
 		if (mh_fputs(buf,scnout) == EOF)\
-		    adios (scnmsg, "write error on");\
+		    DIEWRERR();\
 		}
 
 /*
@@ -90,8 +97,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		width = MAXSCANL;
 	}
 	dat[3] = slwidth = width;
-	if ((scanl = (char *) malloc((size_t) (slwidth + 2) )) == NULL)
-	    adios (NULL, "unable to malloc scan line (%d bytes)", slwidth+2);
+	scanl = (char *) mh_xmalloc((size_t) (slwidth + 2) );
 	if (outnum)
 	    umask(~m_gmprot());
 
@@ -127,8 +133,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	used_buf += ncomps+1; *--used_buf = 0;
 	rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ;
 	for (i = ncomps; i--; )
-	    if ((*nxtbuf++ = malloc(rlwidth)) == NULL)
-		adios (NULL, "unable to allocate component buffer");
+	    *nxtbuf++ = mh_xmalloc(rlwidth);
     }
 
     /*
@@ -187,7 +192,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		compnum++;
 		if (outnum) {
 		    FPUTS (name);
-		    putc (':', scnout);
+		    if ( putc (':', scnout) == EOF) DIEWRERR();
 		    FPUTS (tmpbuf);
 		}
 		/*
@@ -228,7 +233,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		    state = FILEEOF; /* stop now if scan cmd */
 		    goto finished;
 		}
-		putc ('\n', scnout);
+		if (putc ('\n', scnout) == EOF) DIEWRERR();
 		FPUTS (tmpbuf);
 		/*
 		 * performance hack: some people like to run "inc" on
@@ -249,7 +254,7 @@ body:;
 		    if (scnout->_cnt <= 0) {
 #endif
 			if (fflush(scnout) == EOF)
-			    adios (scnmsg, "write error on");
+			    DIEWRERR ();
 		    }
 #ifdef LINUX_STDIO
 		    state = m_getfld(state, name, scnout->_IO_write_ptr,
@@ -274,7 +279,7 @@ body:;
 		if (outnum) {
 		    FPUTS ("\n\nBAD MSG:\n");
 		    FPUTS (name);
-		    putc ('\n', scnout);
+		    if (putc ('\n', scnout) == EOF) DIEWRERR();
 		    state = BODY;
 		    goto body;
 		}
@@ -306,7 +311,10 @@ finished:
     if (size)
 	dat[2] = size;
     else if (outnum > 0)
+    {
 	dat[2] = ftell(scnout);
+	if (dat[2] == EOF) DIEWRERR();
+    }
 
     if ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
 	struct stat st;
@@ -322,9 +330,9 @@ finished:
 		if (datecomp->c_tws == NULL)
 		    adios (NULL, "unable to allocate tws buffer");
 		*datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);
-		datecomp->c_flags = -1;
+		datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
 	    } else {
-		datecomp->c_flags = 0;
+		datecomp->c_flags &= ~CF_DATEFAB;
 	    }
 	}
     }
@@ -353,8 +361,8 @@ finished:
     }
     *--nxtbuf = tmpbuf;
 
-    if (outnum && fclose (scnout) == EOF)
-	adios (scnmsg, "write error on");
+    if (outnum && (ferror(scnout) || fclose (scnout) == EOF))
+	DIEWRERR();
 
     return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
 }