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

[mmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index c5f0329..480cab5 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -2,8 +2,6 @@
 /*
  * scansbr.c -- routines to help scan along...
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -21,13 +19,6 @@
 # define _cnt _w                /* Wretch */
 #endif
 
-#ifdef SCO_5_STDIO
-# define _ptr  __ptr
-# define _cnt  __cnt
-# define _base __base
-# define _filbuf(fp)  ((fp)->__cnt = 0, __filbuf(fp))
-#endif
-
 #define MAXSCANL 256           /* longest possible scan line */
 
 /*
@@ -40,10 +31,6 @@
 #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)                 */
@@ -65,7 +52,6 @@ char *scanl = 0;                      /* text of most recent scanline    */
 /*
  * prototypes
  */
-int sc_width (void);                   /* from termsbr.c */
 static int mh_fputs(char *, FILE *);
 
 #ifdef MULTIBYTE_SUPPORT
@@ -88,11 +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;
-
-#ifdef RPATHS
-    char returnpath[BUFSIZ];
-    char deliverydate[BUFSIZ];
-#endif
+    static size_t scanl_size;
 
     /* first-time only initialization */
     if (!scanl) {
@@ -103,16 +85,16 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                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;
 
-#ifdef JLR
-       fmt_top = fmt;
-#endif /* JLR */
        FINDCOMP(bodycomp, "body");
        FINDCOMP(datecomp, "date");
        FINDCOMP(cptr, "folder");
@@ -175,19 +157,6 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
        }
        if ((scnout = fopen (scnmsg, "w")) == NULL)
            adios (scnmsg, "unable to write");
-#ifdef RPATHS
-       /*
-        * Add the Return-Path and Delivery-Date
-        * header fields to message.
-        */
-       if (get_returnpath (returnpath, sizeof(returnpath),
-               deliverydate, sizeof(deliverydate))) {
-           FPUTS ("Return-Path: ");
-           FPUTS (returnpath);
-           FPUTS ("Delivery-Date: ");
-           FPUTS (deliverydate);
-       }
-#endif /* RPATHS */
     }
 
     /* scan - main loop */
@@ -235,6 +204,15 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
            case BODY: 
                compnum = -1;
+               /*
+                * A slight hack ... if we have less than rlwidth characters
+                * in the buffer, call m_getfld again.
+                */
+
+               if ((i = strlen(tmpbuf)) < rlwidth) {
+                   state = m_getfld (state, name, tmpbuf + i,
+                                     rlwidth - i, inb);
+               }
                if (! outnum) {
                    state = FILEEOF; /* stop now if scan cmd */
                    goto finished;
@@ -349,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;
@@ -380,19 +352,6 @@ finished:
 }
 
 
-/*
- * Cheat:  we are loaded with adrparse, which wants a routine called
- * OfficialName().  We call adrparse:getm() with the correct arguments
- * to prevent OfficialName() from being called.  Hence, the following
- * is to keep the loader happy.
- */
-char *
-OfficialName (char *name)
-{
-    return name;
-}
-
-
 static int
 mh_fputs(char *s, FILE *stream)
 {