X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d02aabc331c325d8206a862a43438f4a472a5306..4a78cbcd4fa986d9c1e7bd0a5a4bdb619faeb7cb:/uip/scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 8fc88257..a07889e4 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -61,8 +61,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
       int unseen, char *folder, long size, int noisy)
 {
     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;
@@ -210,7 +209,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;
@@ -278,10 +277,12 @@ body:;
 
 	    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) {
@@ -345,7 +346,7 @@ finished:
 	}
     }
 
-    fmt_scan (fmt, scanl, scanl_size, slwidth, dat);
+    fmt_scan (fmt, scanl, scanl_size, slwidth, dat, NULL);
 
     if (bodycomp)
 	bodycomp->c_text = saved_c_text;
@@ -394,3 +395,8 @@ void
 scan_eom_action (int (*action)()) {
     m_eomsbr (gstate, action);
 }
+
+void
+scan_reset_m_getfld_state () {
+    m_getfld_state_reset (&gstate);
+}