X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6ba5b855ebc737cc46cabfbe799b0c7706f437f4..b2cc954248dff07883ef749c1c2851dd07e0d400:/uip/scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index a07889e4..ce49bee2 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -14,8 +14,6 @@
 #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
@@ -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    */
 
-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")
 
@@ -50,15 +47,9 @@ m_getfld_state_t gstate;		/* for access by msh */
  */
 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 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;
@@ -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;
-    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;
-	    else if (width > MAXSCANL)
-		width = MAXSCANL;
+	} else if (width == 0) {
+	    /* Unlimited width. */
+	    width = INT_MAX;
 	}
 	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);
 	if (outnum)
 	    umask(~m_gmprot());
 
@@ -143,7 +134,9 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	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);
     }
@@ -346,13 +339,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)
-	fputs (scanl, stdout);
+	fputs (charstring_buffer (*scanl), stdout);
 
     cptr = fmt_findcomp ("encrypted");
     encrypted = cptr && cptr->c_text;
@@ -380,7 +373,7 @@ mh_fputs(char *s, FILE *stream)
     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);
@@ -390,13 +383,3 @@ void
 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);
-}