pending-release-notes: add mhshow's "-prefer", and mh-format's %(kibi/kilo)

[nmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 749743c1c4c3f55b2461ccc3e74f2f8c834fef8f..7391a3bd1403819095ea2530d166316e0313d9f6 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -75,7 +75,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());
 
@@ -126,10 +126,10 @@ 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 *));
+       nxtbuf = compbuffers = (char **) mh_xcalloc ((size_t) ncomps, sizeof(char *));
        if (nxtbuf == NULL)
            adios (NULL, "unable to allocate component buffers");
-       used_buf = (struct comp **) calloc((size_t) (ncomps+1),
+       used_buf = (struct comp **) mh_xcalloc ((size_t) (ncomps+1),
            sizeof(struct comp *));
        if (used_buf == NULL)
            adios (NULL, "unable to allocate component buffer stack");
@@ -327,7 +327,7 @@ finished:
            if (! datecomp->c_text) {
                if (datecomp->c_tws == NULL)
                    datecomp->c_tws = (struct tws *)
-                       calloc((size_t) 1, sizeof(*datecomp->c_tws));
+                       mh_xcalloc ((size_t) 1, sizeof(*datecomp->c_tws));
                if (datecomp->c_tws == NULL)
                    adios (NULL, "unable to allocate tws buffer");
                *datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);