Always initialize those two variables made static in commit

[nmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index a07889e48b424cced88deee44d9e1b93d0f3e6db..7391a3bd1403819095ea2530d166316e0313d9f6 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -14,8 +14,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
 #include <h/tws.h>
 #include <h/utils.h>
 

-#define MAXSCANL 256           /* longest possible scan line */
-

 /*
  * Buffer size for content part of header fields.  We want this
  * to be large enough so that we don't do a lot of extra FLDPLUS
 /*
  * Buffer size for content part of header fields.  We want this
  * to be large enough so that we don't do a lot of extra FLDPLUS


@@ -35,8 +33,7 @@ static struct comp **used_buf = 0;    /* stack for comp that use buffers */
 
 static int dat[5];                     /* aux. data for format routine    */
 
 
 static int dat[5];                     /* aux. data for format routine    */
 

-char *scanl = 0;                       /* text of most recent scanline    */
-m_getfld_state_t gstate;               /* for access by msh */
+static m_getfld_state_t gstate;                /* for accessor functions below    */

 
 #define DIEWRERR() adios (scnmsg, "write error on")
 
 
 #define DIEWRERR() adios (scnmsg, "write error on")
 


@@ -50,15 +47,9 @@ m_getfld_state_t gstate;             /* for access by msh */
  */
 static int mh_fputs(char *, FILE *);
 
  */
 static int mh_fputs(char *, FILE *);
 

-#ifdef MULTIBYTE_SUPPORT
-#define SCAN_CHARWIDTH MB_CUR_MAX
-#else
-#define SCAN_CHARWIDTH 1
-#endif
-

 int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 int
 scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,

-      int unseen, char *folder, long size, int noisy)
+      int unseen, char *folder, long size, int noisy, charstring_t *scanl)

 {
     int i, compnum, encrypted, state;
     char *cp, *tmpbuf, *startbody, **nxtbuf;
 {
     int i, compnum, encrypted, state;
     char *cp, *tmpbuf, *startbody, **nxtbuf;


@@ -70,21 +61,21 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
     char name[NAMESZ];
     int bufsz;
     static int rlwidth, slwidth;
     char name[NAMESZ];
     int bufsz;
     static int rlwidth, slwidth;

-    static size_t scanl_size;

 
 

-    /* first-time only initialization */
-    if (!scanl) {
-       if (width == 0) {
+    /* first-time only initialization, which will always happen the
+       way the code is now, with callers initializing *scanl to NULL.
+       scanl used to be a global. */
+    if (! *scanl) {
+       if (width == -1) {
+           /* Default:  width of the terminal, but at least WIDTH/2. */

            if ((width = sc_width ()) < WIDTH/2)
                width = WIDTH/2;
            if ((width = sc_width ()) < WIDTH/2)
                width = WIDTH/2;

-           else if (width > MAXSCANL)
-               width = MAXSCANL;
+       } else if (width == 0) {
+           /* Unlimited width. */
+           width = INT_MAX;

        }
        dat[3] = slwidth = width;
        }
        dat[3] = slwidth = width;

-       /* Arbitrarily allocate 20 * slwidth to provide room for lots
-          of escape sequences. */
-       scanl_size = SCAN_CHARWIDTH * (20 * slwidth + 2);
-       scanl = (char *) mh_xmalloc (scanl_size);
+       *scanl = charstring_create (width < NMH_BUFSIZ ? width : NMH_BUFSIZ);

        if (outnum)
            umask(~m_gmprot());
 
        if (outnum)
            umask(~m_gmprot());
 


@@ -135,15 +126,17 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
         * and it's our responsibility to free it.
         */
 
         * 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");
        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");
        used_buf += ncomps+1; *--used_buf = 0;
            sizeof(struct comp *));
        if (used_buf == NULL)
            adios (NULL, "unable to allocate component buffer stack");
        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);
     }
        for (i = ncomps; i--; )
            *nxtbuf++ = mh_xmalloc(rlwidth);
     }


@@ -227,7 +220,6 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                break;
 
            case BODY: 
                break;
 
            case BODY: 

-               compnum = -1;

                /*
                 * A slight hack ... if we have less than rlwidth characters
                 * in the buffer, call m_getfld again.
                /*
                 * A slight hack ... if we have less than rlwidth characters
                 * in the buffer, call m_getfld again.


@@ -335,7 +327,7 @@ finished:
            if (! datecomp->c_text) {
                if (datecomp->c_tws == NULL)
                    datecomp->c_tws = (struct tws *)
            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);
                if (datecomp->c_tws == NULL)
                    adios (NULL, "unable to allocate tws buffer");
                *datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);


@@ -346,13 +338,13 @@ finished:
        }
     }
 
        }
     }
 

-    fmt_scan (fmt, scanl, scanl_size, slwidth, dat, NULL);
+    fmt_scan (fmt, *scanl, slwidth, dat, NULL);

 
     if (bodycomp)
        bodycomp->c_text = saved_c_text;
 
     if (noisy)
 
     if (bodycomp)
        bodycomp->c_text = saved_c_text;
 
     if (noisy)

-       fputs (scanl, stdout);
+       fputs (charstring_buffer (*scanl), stdout);

 
     cptr = fmt_findcomp ("encrypted");
     encrypted = cptr && cptr->c_text;
 
     cptr = fmt_findcomp ("encrypted");
     encrypted = cptr && cptr->c_text;


@@ -380,7 +372,7 @@ mh_fputs(char *s, FILE *stream)
     return (0);
 }
 
     return (0);
 }
 

-/* The following three functions allow access to the global gstate above. */
+/* The following two functions allow access to the global gstate above. */

 void
 scan_finished () {
     m_getfld_state_destroy (&gstate);
 void
 scan_finished () {
     m_getfld_state_destroy (&gstate);


@@ -390,13 +382,3 @@ void
 scan_detect_mbox_style (FILE *f) {
     m_unknown (&gstate, f);
 }
 scan_detect_mbox_style (FILE *f) {
     m_unknown (&gstate, f);
 }

-
-void
-scan_eom_action (int (*action)()) {
-    m_eomsbr (gstate, action);
-}
-
-void
-scan_reset_m_getfld_state () {
-    m_getfld_state_reset (&gstate);
-}