uip/folder.c: Rewrite plural test to common form.

[nmh] / sbr / mf.c

diff --git a/sbr/mf.c b/sbr/mf.c
index 00e158224df058fea8bc08e0eb0a87eb51a17ada..b6c729123f308d58981c69f9a9b8a82a84a276b3 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -1,11 +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>
 
@@ -25,8 +25,10 @@ static int my_lex (char *);
 static int
 isat (const char *p)
 {
-    return has_prefix(p, " AT ") || has_prefix(p, " At ") ||
-        has_prefix(p, " aT ") || has_prefix(p, " at ");
+    return *p == ' ' &&
+        (p[1] == 'a' || p[1] == 'A') &&
+        (p[2] == 't' || p[2] == 'T') &&
+        p[3] == ' ';
 }
 
 
@@ -135,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];
@@ -154,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
@@ -201,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");
         }
     }
@@ -233,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;
@@ -507,13 +509,13 @@ domain (char *buffer)
 static int
 route (char *buffer)
 {
-    path = mh_xstrdup ("@");
+    routepath = mh_xstrdup ("@");
 
     for (;;) {
        switch (my_lex (buffer)) {
            case LX_ATOM: 
            case LX_DLIT: 
-               path = add (buffer, path);
+               routepath = add (buffer, routepath);
                break;
 
            default: 
@@ -522,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: 
@@ -542,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: