Print information about the compiler toolchain on Darwin and FreeBSD.

[nmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 930cfbc25f65864ca4d1dd0681f83a8f5f889fed..abcb496253dd28d0ae4fe6dd822d9dc2b87a771f 100644 (file)
--- 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;
@@ -390,11 +391,6 @@ 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);