X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c53b61f8d4a809ab53e954594874285ca32d1b11..a3724ed3:/sbr/mf.c?ds=inline

diff --git a/sbr/mf.c b/sbr/mf.c
index ebd130d2..cf5b6d81 100644
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -1,12 +1,11 @@
-
-/*
- * mf.c -- mail filter subroutines
+/* mf.c -- mail filter subroutines
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
+#include <h/mh.h>
 #include <h/mf.h>
 #include <h/utils.h>
 
@@ -23,39 +22,13 @@ static int route (char *);
 static int my_lex (char *);
 
 
-int
-isfrom(const char *string)
-{
-    return (strncmp (string, "From ", 5) == 0
-	    || strncmp (string, ">From ", 6) == 0);
-}
-
-
-int
-lequal (const char *a, const char *b)
-{
-    char c1, c2;
-
-    for (; *a; a++, b++) {
-	if (*b == 0)
-	    return FALSE;
-        c1 = toupper((unsigned char)*a);
-        c2 = toupper((unsigned char)*b);
-        if (c1 != c2)
-            return FALSE;
-    }
-
-    return (*b == 0);
-}
-
-
 static int
 isat (const char *p)
 {
-    return (strncmp (p, " AT ", 4)
-	    && strncmp (p, " At ", 4)
-	    && strncmp (p, " aT ", 4)
-	    && strncmp (p, " at ", 4) ? FALSE : TRUE);
+    return *p == ' ' &&
+        (p[1] == 'a' || p[1] == 'A') &&
+        (p[2] == 't' || p[2] == 'T') &&
+        p[3] == ' ';
 }
 
 
@@ -164,7 +137,7 @@ static char *ap = NULL;
 static char *pers = NULL;
 static char *mbox = NULL;
 static char *host = NULL;
-static char *path = NULL;
+static char *routepath = NULL;
 static char *grp = NULL;
 static char *note = NULL;
 static char err[BUFSIZ];
@@ -183,14 +156,14 @@ getadrx (const char *addrs, int eai)
     mh_xfree(pers);
     mh_xfree(mbox);
     mh_xfree(host);
-    mh_xfree(path);
+    mh_xfree(routepath);
     mh_xfree(grp);
     mh_xfree(note);
-    pers = mbox = host = path = grp = note = NULL;
+    pers = mbox = host = routepath = grp = note = NULL;
     err[0] = 0;
 
     if (dp == NULL) {
-	dp = cp = strdup (addrs ? addrs : "");
+	dp = cp = strdup (FENDNULL(addrs));
 	glevel = 0;
     }
     else
@@ -230,7 +203,7 @@ getadrx (const char *addrs, int eai)
          */
 
         if (contains8bit(mbox, NULL) || contains8bit(host, NULL) ||
-            contains8bit(path, NULL) || contains8bit(grp, NULL)) {
+            contains8bit(routepath, NULL) || contains8bit(grp, NULL)) {
             strcpy(err, "Address contains 8-bit characters");
         }
     }
@@ -262,7 +235,7 @@ getadrx (const char *addrs, int eai)
     adrxp->pers = pers;
     adrxp->mbox = mbox;
     adrxp->host = host;
-    adrxp->path = path;
+    adrxp->path = routepath;
     adrxp->grp = grp;
     adrxp->ingrp = ingrp;
     adrxp->note = note;
@@ -290,6 +263,7 @@ again: ;
 		strcpy (err, "extraneous semi-colon");
 		return NOTOK;
 	    }
+	    /* FALLTHRU */
 	case LX_COMA: 
             mh_xfree(note);
             note = NULL;
@@ -393,6 +367,7 @@ again: ;
 			strcpy (err, "extraneous semi-colon");
 			return NOTOK;
 		    }
+		    return OK;
 		case LX_COMA: 
 		case LX_END: 
 		    return OK;
@@ -534,13 +509,13 @@ domain (char *buffer)
 static int
 route (char *buffer)
 {
-    path = strdup ("@");
+    routepath = mh_xstrdup ("@");
 
     for (;;) {
 	switch (my_lex (buffer)) {
 	    case LX_ATOM: 
 	    case LX_DLIT: 
-		path = add (buffer, path);
+		routepath = add (buffer, routepath);
 		break;
 
 	    default: 
@@ -549,14 +524,14 @@ route (char *buffer)
 	}
 	switch (my_lex (buffer)) {
 	    case LX_COMA: 
-		path = add (buffer, path);
+		routepath = add (buffer, routepath);
 		for (;;) {
 		    switch (my_lex (buffer)) {
 			case LX_COMA: 
 			    continue;
 
 			case LX_AT: 
-			    path = add (buffer, path);
+			    routepath = add (buffer, routepath);
 			    break;
 
 			default: 
@@ -569,11 +544,11 @@ route (char *buffer)
 
 	    case LX_AT:		/* XXX */
 	    case LX_DOT: 
-		path = add (buffer, path);
+		routepath = add (buffer, routepath);
 		continue;
 
 	    case LX_COLN: 
-		path = add (buffer, path);
+		routepath = add (buffer, routepath);
 		return OK;
 
 	    default: 
@@ -625,6 +600,7 @@ my_lex (char *buffer)
 		    continue;
 		case '(': 
 		    i++;
+		    /* FALLTHRU */
 		default: 
 		    ADDCHR(c);
 		    continue;
@@ -652,6 +628,7 @@ my_lex (char *buffer)
 			cp = NULL;
 			return (last_lex = LX_ERR);
 		    }
+		    /* FALLTHRU */
 		default: 
 		    ADDCHR(c);
 		    continue;
@@ -675,6 +652,7 @@ my_lex (char *buffer)
 			cp = NULL;
 			return (last_lex = LX_ERR);
 		    }
+		    /* FALLTHRU */
 		default: 
 		    ADDCHR(c);
 		    continue;
@@ -739,59 +717,3 @@ legal_person (const char *p)
 
     return (char *) p;
 }
-
-
-int
-mfgets (FILE *in, char **bp)
-{
-    int i;
-    char *cp, *dp, *ep;
-    static int len = 0;
-    static char *pp = NULL;
-
-    if (pp == NULL)
-	pp = mh_xmalloc ((size_t) (len = BUFSIZ));
-
-    for (ep = (cp = pp) + len - 2;;) {
-	switch (i = getc (in)) {
-	    case EOF: 
-	eol: 	;
-		if (cp != pp) {
-		    *cp = 0;
-		    *bp = pp;
-		    return OK;
-		}
-	eoh:	;
-		*bp = NULL;
-		free (pp);
-		pp = NULL;
-		return DONE;
-
-	    case 0: 
-		continue;
-
-	    case '\n': 
-		if (cp == pp)	/* end of headers, gobble it */
-		    goto eoh;
-		switch (i = getc (in)) {
-		    default: 	/* end of line */
-		    case '\n': 	/* end of headers, save for next call */
-			ungetc (i, in);
-			goto eol;
-
-		    case ' ': 	/* continue headers */
-		    case '\t': 
-			*cp++ = '\n';
-			break;
-		}		/* fall into default case */
-
-	    default: 
-		*cp++ = i;
-		break;
-	}
-	if (cp >= ep) {
-	    dp = mh_xrealloc (pp, (size_t) (len += BUFSIZ));
-	    cp += dp - pp, ep = (pp = cp) + len - 2;
-	}
-    }
-}