Added argument to fmt_scan() to specify the buffer size.

diff --git a/h/fmt_scan.h b/h/fmt_scan.h
index d8fab615e181a617c396957d6879baeddc66d72a..837780c33bf72f67f053e9d6674dbaa46a01b6d4 100644 (file)
--- a/h/fmt_scan.h
+++ b/h/fmt_scan.h
@@ -90,7 +90,7 @@ struct format {
 /*
  * prototypes
  */
 /*
  * prototypes
  */

-struct format *fmt_scan (struct format *, char *, int, int *);
+struct format *fmt_scan (struct format *, char *, size_t, int, int *);

 char *new_fs (char *, char *, char *);
 int fmt_compile (char *, struct format **);
 char *formataddr(char *, char *);
 char *new_fs (char *, char *, char *);
 int fmt_compile (char *, struct format **);
 char *formataddr(char *, char *);

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 74cfd927f2aaf1f0e4106a304b5027fda3338cec..51ba24cf86c0a75d132863e202702e9d9aba04f5 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -317,7 +317,7 @@ get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len)
 }
 
 struct format *
 }
 
 struct format *

-fmt_scan (struct format *format, char *scanl, int width, int *dat)
+fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat)

 {
     char *cp, *ep;
     unsigned char *sp;
 {
     char *cp, *ep;
     unsigned char *sp;


@@ -332,8 +332,11 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
     struct tws *tws;
     struct mailname *mn;
 
     struct tws *tws;
     struct mailname *mn;
 

+    /* ep keeps track of displayed characters.  They're limited by width.
+       The total number of characters, cp - scanl + 1 (for trailing NULL),
+       includes invisible control characters and is limited by max. */

     cp = scanl;
     cp = scanl;

-    ep = scanl + width - 1;
+    ep = scanl + (width <= (int) max ? width : (int) max) - 1;

 
     for (fmt = format; fmt->f_type != FT_DONE; fmt++)
        switch (fmt->f_type) {
 
     for (fmt = format; fmt->f_type != FT_DONE; fmt++)
        switch (fmt->f_type) {


@@ -974,9 +977,14 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
     }
 #ifndef JLR
     finished:;
     }
 #ifndef JLR
     finished:;

-    if (cp[-1] != '\n')
-       *cp++ = '\n';
-    *cp   = 0;
+    if (cp > scanl  &&  cp[-1] != '\n') {
+       if (cp - scanl < (int) max - 1) {
+           *cp++ = '\n';
+       } else {
+           cp[-1] = '\n';
+       }
+    }
+    *cp = '\0';

     return ((struct format *)0);
 #else /* JLR */
     if (cp[-1] != '\n')
     return ((struct format *)0);
 #else /* JLR */
     if (cp[-1] != '\n')

diff --git a/uip/ap.c b/uip/ap.c
index b5b0c5b99c1631167b4303a4f48c28ed31b36660..fdb47e2a309c8c1ba4e453d1c7287ad5523c71cc 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -190,7 +190,7 @@ process (char *arg, int length, int norm)
        if (cptr)
            cptr->c_text = p->pq_error;
 
        if (cptr)
            cptr->c_text = p->pq_error;
 

-       fmt_scan (fmt, buffer, length, dat);
+       fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat);

        fputs (buffer, stdout);
 
        free (p->pq_text);
        fputs (buffer, stdout);
 
        free (p->pq_text);

diff --git a/uip/comp.c b/uip/comp.c
index 29ca1b77d0dad824ad6cad078031dc66b3281362..f7a8f8f593e3cac4b6a9cc9dedf73c3913c4708c 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -392,7 +392,7 @@ try_it_again:
        dat[2] = 0;
        dat[3] = outputlinelen;
        dat[4] = 0;
        dat[2] = 0;
        dat[3] = outputlinelen;
        dat[4] = 0;

-       fmt_scan(fmt, scanl, i, dat);
+       fmt_scan(fmt, scanl, i + 1, i, dat);

        write(out, scanl, strlen(scanl));
        free(scanl);
     } else {
        write(out, scanl, strlen(scanl));
        free(scanl);
     } else {

diff --git a/uip/dp.c b/uip/dp.c
index a66beed827644763d04cb46572cedef496b1c6ed..95a71637f93337c58c9c0864cb1b77c7d045ffba 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -144,7 +144,7 @@ process (char *date, int length)
     FINDCOMP (cptr, "text");
     if (cptr)
        cptr->c_text = date;
     FINDCOMP (cptr, "text");
     if (cptr)
        cptr->c_text = date;

-    fmt_scan (fmt, buffer, length, dat);
+    fmt_scan (fmt, buffer, sizeof buffer - 1, length, dat);

     fputs (buffer, stdout);
 
     return status;
     fputs (buffer, stdout);
 
     return status;

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 79dfd10b350f2ecd74a5d0393aca75ebf16f4a88..9abf20de30184039f92aef9da07cae39c1a02fbd 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -191,7 +191,7 @@ finished:
        adios ("dup", "unable to");
 
     line = mh_xmalloc ((unsigned) fmtsize);
        adios ("dup", "unable to");
 
     line = mh_xmalloc ((unsigned) fmtsize);

-    fmt_scan (fmt, line, fmtsize, dat);
+    fmt_scan (fmt, line, fmtsize - 1, fmtsize, dat);

     fputs (line, tmp);
     free (line);
     if (fclose (tmp))
     fputs (line, tmp);
     free (line);
     if (fclose (tmp))

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 8cd5c34a8d266f9f0b5c0e1af65b6a6a617b98af..9964fa05280f4637e0fd13898f78ccca9120aca3 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -1118,7 +1118,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
            if (!cp[1])
                *cp = 0;
 
            if (!cp[1])
                *cp = 0;
 

-       fmt_scan (c1->c_fmt, buffer, sizeof(buffer) - 1, dat);
+       fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat);

        /* Don't need to append a newline, dctime() already did */
        c2->c_text = getcpy (buffer);
 
        /* Don't need to append a newline, dctime() already did */
        c2->c_text = getcpy (buffer);
 


@@ -1149,7 +1149,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
        if (cptr)
            cptr->c_text = p->pq_error;
 
        if (cptr)
            cptr->c_text = p->pq_error;
 

-       fmt_scan (c1->c_fmt, buffer, sizeof(buffer) - 1, dat);
+       fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat);

        if (*buffer) {
            if (c2->c_text)
                c2->c_text = add (",\n", c2->c_text);
        if (*buffer) {
            if (c2->c_text)
                c2->c_text = add (",\n", c2->c_text);


@@ -1945,7 +1945,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
 
        for (a = c1->c_f_args, i = 1; a != NULL; a = a->a_next, i++) {
            args[i] = mh_xmalloc(BUFSIZ);
 
        for (a = c1->c_f_args, i = 1; a != NULL; a = a->a_next, i++) {
            args[i] = mh_xmalloc(BUFSIZ);

-           fmt_scan(a->a_fmt, args[i], BUFSIZ, dat);
+           fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat);

            /*
             * fmt_scan likes to put a trailing newline at the end of the
             * format string.  If we have one, get rid of it.
            /*
             * fmt_scan likes to put a trailing newline at the end of the
             * format string.  If we have one, get rid of it.

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 8ff0365bd6b904fbccfbad319ed7d28d7912bbf5..4061735505a4692fa6d9b7eb2a6018381b20ce80 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -262,7 +262,7 @@ finished: ;
     scanl = mh_xmalloc ((size_t) i + 2);
     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;
     scanl = mh_xmalloc ((size_t) i + 2);
     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;

-    fmt_scan (fmt, scanl, i, dat);
+    fmt_scan (fmt, scanl, i + 1, i, dat);

     fputs (scanl, out);
 
     if (ferror (out))
     fputs (scanl, out);
 
     if (ferror (out))

diff --git a/uip/replsbr.c b/uip/replsbr.c
index a6d0f233b54e455a577731596991b199c37ad620..f6ccd3529bf87ee1c4ce53972e4f2010b57e85c8 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -237,7 +237,7 @@ finished:
     dat[2] = 0;
     dat[3] = outputlinelen;
     dat[4] = 0;
     dat[2] = 0;
     dat[3] = outputlinelen;
     dat[4] = 0;

-    fmt_scan (fmt, scanl, i, dat);
+    fmt_scan (fmt, scanl, i + 1, i, dat);

     fputs (scanl, out);
     if (badaddrs) {
        fputs ("\nrepl: bad addresses:\n", out);
     fputs (scanl, out);
     if (badaddrs) {
        fputs ("\nrepl: bad addresses:\n", out);

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 3d66bcf5bc9c4bb84262decaf47d72dc403bc71e..480cab5baa5b2d341a7fbb4fe3c2ff3715754a63 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -31,10 +31,6 @@
 #define SBUFSIZ 512
 
 static struct format *fmt;
 #define SBUFSIZ 512
 
 static struct format *fmt;

-#ifdef JLR
-static struct format *fmt_top;
-#endif /* JLR */
-

 static struct comp *datecomp;          /* pntr to "date" comp             */
 static struct comp *bodycomp;          /* pntr to "body" pseudo-comp      *
                                         * (if referenced)                 */
 static struct comp *datecomp;          /* pntr to "date" comp             */
 static struct comp *bodycomp;          /* pntr to "body" pseudo-comp      *
                                         * (if referenced)                 */


@@ -78,6 +74,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
     FILE *scnout = NULL;
     char name[NAMESZ];
     static int rlwidth, slwidth;
     FILE *scnout = NULL;
     char name[NAMESZ];
     static int rlwidth, slwidth;

+    static size_t scanl_size;

 
     /* first-time only initialization */
     if (!scanl) {
 
     /* first-time only initialization */
     if (!scanl) {


@@ -88,16 +85,16 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                width = MAXSCANL;
        }
        dat[3] = slwidth = width;
                width = MAXSCANL;
        }
        dat[3] = slwidth = width;

-       scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * (slwidth + 2) );
+       /* 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);

        if (outnum)
            umask(~m_gmprot());
 
        /* Compile format string */
        ncomps = fmt_compile (nfs, &fmt) + 1;
 
        if (outnum)
            umask(~m_gmprot());
 
        /* Compile format string */
        ncomps = fmt_compile (nfs, &fmt) + 1;
 

-#ifdef JLR
-       fmt_top = fmt;
-#endif /* JLR */

        FINDCOMP(bodycomp, "body");
        FINDCOMP(datecomp, "date");
        FINDCOMP(cptr, "folder");
        FINDCOMP(bodycomp, "body");
        FINDCOMP(datecomp, "date");
        FINDCOMP(cptr, "folder");


@@ -330,13 +327,7 @@ finished:
        }
     }
 
        }
     }
 

-    fmt_scan (fmt, scanl, slwidth, dat);
-
-#if 0
-    fmt = fmt_scan (fmt, scanl, slwidth, dat);
-    if (!fmt)
-       fmt = fmt_top;          /* reset for old format files */
-#endif
+    fmt_scan (fmt, scanl, scanl_size, slwidth, dat);

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