Reverted commit 9a4b4a3d3b27fe4a7ff6d0b8724ce1c06b5917eb.

[nmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index ce49bee21f9dd21cce5afb21bd46bf98d04cff2c..191e69e8490286cda51ceff2dbcd70c11551fc80 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -38,15 +38,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 +70,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 +81,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,13 +121,8 @@ 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)
            ? min (width, NMH_BUFSIZ)
@@ -162,9 +152,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) {
@@ -220,7 +209,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.
@@ -243,7 +231,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
@@ -327,10 +315,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 {
@@ -362,17 +347,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 () {