Change all chars being passed to the ctype macros (isalph(), etc.) to

[mmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index be68bf8..1b6a0ed 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -14,6 +14,7 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
+#include <h/utils.h>
 
 #ifdef _FSTDIO
 # define _ptr _p                /* Gag    */
@@ -73,7 +74,8 @@ 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;
-    char *cp, *tmpbuf, **nxtbuf;
+    unsigned char *cp, *tmpbuf;
+    char **nxtbuf;
     char *saved_c_text;
     struct comp *cptr;
     struct comp **savecomp;
@@ -96,8 +98,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                width = MAXSCANL;
        }
        dat[3] = slwidth = width;
-       if ((scanl = (char *) malloc((size_t) (slwidth + 2) )) == NULL)
-           adios (NULL, "unable to malloc scan line (%d bytes)", slwidth+2);
+       scanl = (char *) mh_xmalloc((size_t) MB_CUR_MAX * (slwidth + 2) );
        if (outnum)
            umask(~m_gmprot());
 
@@ -133,8 +134,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
        used_buf += ncomps+1; *--used_buf = 0;
        rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ;
        for (i = ncomps; i--; )
-           if ((*nxtbuf++ = malloc(rlwidth)) == NULL)
-               adios (NULL, "unable to allocate component buffer");
+           *nxtbuf++ = mh_xmalloc(rlwidth);
     }
 
     /*
@@ -204,7 +204,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                 */
                if ((cptr = wantcomp[CHASH(name)])) {
                    do {
-                       if (!strcasecmp(name, cptr->c_name)) {
+                       if (!mh_strcasecmp(name, cptr->c_name)) {
                            if (! cptr->c_text) {
                                cptr->c_text = tmpbuf;
                                for (cp = tmpbuf + strlen (tmpbuf) - 1;