X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adc0a3232c43033729dbc036f0757bddfba463bd..92128dac:/uip/scansbr.c?ds=inline

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 9f77f86b..97df2c3a 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -14,8 +14,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
-m_getfld_state_t gstate;
-
 #define MAXSCANL 256		/* longest possible scan line */
 
 /*
@@ -37,7 +35,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 */
 
 #define DIEWRERR() adios (scnmsg, "write error on")
 
@@ -51,19 +49,12 @@ char *scanl = 0;			/* text of most recent scanline    */
  */
 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;
-    unsigned char *cp, *tmpbuf, *startbody;
-    char **nxtbuf;
+    char *cp, *tmpbuf, *startbody, **nxtbuf;
     char *saved_c_text = NULL;
     struct comp *cptr;
     struct comp **savecomp;
@@ -72,10 +63,11 @@ 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) {
+    /* 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 == 0) {
 	    if ((width = sc_width ()) < WIDTH/2)
 		width = WIDTH/2;
@@ -83,10 +75,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		width = MAXSCANL;
 	}
 	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());
 
@@ -167,7 +156,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
      */
     bufsz = rlwidth;
     m_getfld_state_reset (&gstate);
-    if ((state = m_getfld (gstate, name, tmpbuf, &bufsz, inb)) == FILEEOF) {
+    if ((state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb)) == FILEEOF) {
 	if (ferror(inb)) {
 	    advise("read", "unable to"); /* "read error" */
 	    return SCNFAT;
@@ -190,7 +179,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
     /* scan - main loop */
     for (compnum = 1; ;
-	bufsz = rlwidth, state = m_getfld (gstate, name, tmpbuf, &bufsz, inb)) {
+	bufsz = rlwidth, state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb)) {
 	switch (state) {
 	    case FLD: 
 	    case FLDPLUS: 
@@ -211,7 +200,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 			cptr->c_text = tmpbuf;
 			for (cp = tmpbuf + strlen (tmpbuf) - 1; 
 					cp >= tmpbuf; cp--)
-			    if (isspace (*cp))
+			    if (isspace ((unsigned char) *cp))
 				*cp = 0;
 			    else
 				break;
@@ -222,7 +211,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
 		while (state == FLDPLUS) {
 		    bufsz = rlwidth;
-		    state = m_getfld (gstate, name, tmpbuf, &bufsz, inb);
+		    state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb);
 		    if (outnum)
 			FPUTS (tmpbuf);
 		}
@@ -237,7 +226,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
 		if ((i = strlen(tmpbuf)) < rlwidth) {
 		    bufsz = rlwidth - i;
-		    state = m_getfld (gstate, name, tmpbuf + i, &bufsz, inb);
+		    state = m_getfld (&gstate, name, tmpbuf + i, &bufsz, inb);
 		}
 
 		if (! outnum) {
@@ -272,17 +261,19 @@ body:;
 
 		while (state == BODY) {
 		    bufsz = rlwidth;
-		    state = m_getfld (gstate, name, tmpbuf, &bufsz, inb);
+		    state = m_getfld (&gstate, name, tmpbuf, &bufsz, inb);
 		    FPUTS(tmpbuf);
 		}
 		goto finished;
 
 	    case LENERR: 
 	    case FMTERR: 
-		fprintf (stderr, 
-			innum ? "??Format error (message %d) in "
-			      : "??Format error in ",
-			outnum ? outnum : innum);
+	    	if (innum)
+		    fprintf (stderr, "??Format error (message %d) in ",
+			     outnum ? outnum : innum);
+		else
+		    fprintf (stderr, "??Format error in ");
+
 		fprintf (stderr, "component %d\n", compnum);
 
 		if (outnum) {
@@ -346,23 +337,21 @@ finished:
 	}
     }
 
-    fmt_scan (fmt, scanl, scanl_size, slwidth, dat);
+    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;
 
     /* return dynamically allocated buffers to pool */
     while ((cptr = *savecomp++)) {
-	*--nxtbuf = cptr->c_text;
 	cptr->c_text = NULL;
     }
-    *--nxtbuf = tmpbuf;
 
     if (outnum && (ferror(scnout) || fclose (scnout) == EOF))
 	DIEWRERR();
@@ -382,3 +371,18 @@ mh_fputs(char *s, FILE *stream)
     return (0);
 }
 
+/* The following three functions allow access to the global gstate above. */
+void
+scan_finished () {
+    m_getfld_state_destroy (&gstate);
+}
+
+void
+scan_detect_mbox_style (FILE *f) {
+    m_unknown (&gstate, f);
+}
+
+void
+scan_reset_m_getfld_state () {
+    m_getfld_state_reset (&gstate);
+}