X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2adafe760a9c45b417727a3f5d9481de26471a8b..c8caafcb4a39516eaec330f9ea229ea52e5fe46b:/uip/scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 2111bc16..ce29fa8b 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -1,6 +1,4 @@
-
-/*
- * scansbr.c -- routines to help scan along...
+/* scansbr.c -- routines to help scan along...
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -38,15 +36,10 @@ static m_getfld_state_t gstate;		/* for accessor functions below    */
 #define DIEWRERR() adios (scnmsg, "write error on")
 
 #define FPUTS(buf) {\
-		if (mh_fputs(buf,scnout) == EOF)\
+		if (fputs(buf,scnout) == EOF)\
 		    DIEWRERR();\
 		}
 
-/*
- * prototypes
- */
-static int mh_fputs(char *, FILE *);
-
 int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
       int unseen, char *folder, long size, int noisy, charstring_t *scanl)
@@ -75,7 +68,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	    width = INT_MAX;
 	}
 	dat[3] = slwidth = width;
-	*scanl = charstring_create (width);
+	*scanl = charstring_create (width < NMH_BUFSIZ ? width : NMH_BUFSIZ);
 	if (outnum)
 	    umask(~m_gmprot());
 
@@ -86,7 +79,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	datecomp = fmt_findcomp("date");
 	cptr = fmt_findcomp("folder");
 	if (cptr && folder)
-	    cptr->c_text = getcpy(folder);
+	    cptr->c_text = mh_xstrdup(folder);
 	if (fmt_addcompentry("encrypted")) {
 		ncomps++;
 	}
@@ -126,15 +119,12 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	 * and it's our responsibility to free it.
 	 */
 
-	nxtbuf = compbuffers = (char **) calloc((size_t) ncomps, sizeof(char *));
-	if (nxtbuf == NULL)
-	    adios (NULL, "unable to allocate component buffers");
-	used_buf = (struct comp **) calloc((size_t) (ncomps+1),
-	    sizeof(struct comp *));
-	if (used_buf == NULL)
-	    adios (NULL, "unable to allocate component buffer stack");
+	nxtbuf = compbuffers = mh_xcalloc(ncomps, sizeof *nxtbuf);
+	used_buf = mh_xcalloc(ncomps + 1, sizeof *used_buf);
 	used_buf += ncomps+1; *--used_buf = 0;
-	rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ;
+	rlwidth = bodycomp && (width > SBUFSIZ)
+	    ? min (width, NMH_BUFSIZ)
+	    : SBUFSIZ;
 	for (i = ncomps; i--; )
 	    *nxtbuf++ = mh_xmalloc(rlwidth);
     }
@@ -160,9 +150,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	if (ferror(inb)) {
 	    advise("read", "unable to"); /* "read error" */
 	    return SCNFAT;
-	} else {
-	    return SCNEOF;
 	}
+        return SCNEOF;
     }
 
     if (outnum) {
@@ -218,7 +207,6 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		break;
 
 	    case BODY: 
-		compnum = -1;
 		/*
 		 * A slight hack ... if we have less than rlwidth characters
 		 * in the buffer, call m_getfld again.
@@ -241,7 +229,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                  * The previous code here used to call m_getfld() using
                  * pointers to the underlying output stdio buffers to
                  * avoid the extra copy.  Tests by Markus Schnalke show
-                 * no noticable performance loss on larger mailboxes
+                 * no noticeable performance loss on larger mailboxes
                  * if we incur an extra copy, and messing around with
                  * internal stdio buffers is becoming more and more
                  * unportable as times go on.  So from now on just deal
@@ -283,7 +271,7 @@ body:;
 		    state = BODY;
 		    goto body;
 		}
-		/* fall through */
+		/* FALLTHRU */
 
 	    case FILEEOF:
 		goto finished;
@@ -325,10 +313,7 @@ finished:
 	if (datecomp) {
 	    if (! datecomp->c_text) {
 		if (datecomp->c_tws == NULL)
-		    datecomp->c_tws = (struct tws *)
-			calloc((size_t) 1, sizeof(*datecomp->c_tws));
-		if (datecomp->c_tws == NULL)
-		    adios (NULL, "unable to allocate tws buffer");
+		    NEW0(datecomp->c_tws);
 		*datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);
 		datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
 	    } else {
@@ -360,17 +345,6 @@ finished:
 }
 
 
-static int
-mh_fputs(char *s, FILE *stream)
-{
-    char c;
-
-    while ((c = *s++)) 
-	if (putc (c,stream) == EOF )
-	    return(EOF);
-    return (0);
-}
-
 /* The following two functions allow access to the global gstate above. */
 void
 scan_finished () {