Replace mh_xmalloc() with mh_xcalloc()

[mmh] / sbr / m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 059e0e3..6931b2e 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -8,6 +8,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <ctype.h>
+#include <sysexits.h>
 
 /*
 ** This module has a long and checkered history.
@@ -137,7 +139,7 @@ int ismbox = FALSE;
 ** is used in m_Eom because the first character of the string
 ** has been read and matched before m_Eom is called.
 */
-char *msg_delim = "";
+static char *msg_delim = "";
 
 static unsigned char *fdelim;
 static unsigned char *delimend;
@@ -163,8 +165,8 @@ int
 m_getfld(int state, unsigned char *name, unsigned char *buf,
        int bufsz, FILE *iob)
 {
-       register unsigned char  *bp, *cp, *ep, *sp;
-       register int cnt, c, i, j;
+       unsigned char  *bp, *cp, *ep, *sp;
+       int cnt, c, i, j;
 
        if ((c = getc(iob)) < 0) {
                msg_count = 0;
@@ -185,8 +187,6 @@ m_getfld(int state, unsigned char *name, unsigned char *buf,
        }
 
        switch (state) {
-       case FLDEOF:
-       case BODYEOF:
        case FLD:
                if (c == '\n' || c == '-') {
                        /* we hit the header/body separator */
@@ -562,7 +562,7 @@ m_getfld(int state, unsigned char *name, unsigned char *buf,
                break;
 
        default:
-               adios(NULL, "m_getfld() called with bogus state of %d", state);
+               adios(EX_SOFTWARE, NULL, "m_getfld() called with bogus state of %d", state);
        }
 finish:
        *cp = 0;
@@ -574,10 +574,10 @@ finish:
 void
 thisisanmbox(FILE *iob)
 {
-       register int c;
+       int c;
        char text[10];
-       register char *cp;
-       register char *delimstr;
+       char *cp;
+       char *delimstr;
 
        c = getc(iob); 
        if (feof(iob)) {
@@ -598,10 +598,10 @@ thisisanmbox(FILE *iob)
        */
 
        if (fread(text, sizeof(*text), 5, iob) != 5) {
-               adios(NULL, "Read error");
+               adios(EX_IOERR, NULL, "Read error");
        }
        if (strncmp(text, "From ", 5)!=0) {
-               adios(NULL, "No Unix style (mbox) maildrop.");
+               adios(EX_USAGE, NULL, "No Unix style (mbox) maildrop.");
        }
        ismbox = TRUE;
        delimstr = "\nFrom ";
@@ -609,7 +609,7 @@ thisisanmbox(FILE *iob)
                continue;
        }
        c = strlen(delimstr);
-       fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
+       fdelim = (unsigned char *) mh_xcalloc((size_t) (c + 3), sizeof(char));
        *fdelim++ = '\0';
        *fdelim = '\n';
        msg_delim = (char *)fdelim+1;
@@ -619,14 +619,14 @@ thisisanmbox(FILE *iob)
        strcpy(msg_delim, delimstr);
        delimend = (unsigned char *)msg_delim + edelimlen;
        if (edelimlen <= 1)
-               adios(NULL, "maildrop delimiter must be at least 2 bytes");
+               adios(EX_DATAERR, NULL, "maildrop delimiter must be at least 2 bytes");
        /*
        ** build a Boyer-Moore end-position map for the matcher in m_getfld.
        ** N.B. - we don't match just the first char (since it's the newline
        ** separator) or the last char (since the matchc would have found it
        ** if it was a real delim).
        */
-       pat_map = (unsigned char **) calloc(256, sizeof(unsigned char *));
+       pat_map = (unsigned char **) mh_xcalloc(256, sizeof(unsigned char *));
 
        for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
                pat_map[(unsigned char)*cp] = (unsigned char *) cp;
@@ -640,8 +640,8 @@ thisisanmbox(FILE *iob)
 static int
 m_Eom(int c, FILE *iob)
 {
-       register long pos = 0L;
-       register int i;
+       long pos = 0L;
+       int i;
        char text[10];
 
        pos = ftell(iob);
@@ -672,11 +672,11 @@ m_Eom(int c, FILE *iob)
 static unsigned char *
 matchc(int patln, char *pat, int strln, char *str)
 {
-       register char *es = str + strln - patln;
-       register char *sp;
-       register char *pp;
-       register char *ep = pat + patln;
-       register char pc = *pat++;
+       char *es = str + strln - patln;
+       char *sp;
+       char *pp;
+       char *ep = pat + patln;
+       char pc = *pat++;
 
        for(;;) {
                while (pc != *str++)