Merge remote-tracking branch 'origin' into xoauth

[nmh] / sbr / mf.c

diff --git a/sbr/mf.c b/sbr/mf.c
index c88681787e5a72297eeb3880123b5e3eded978b4..c11b0c10e8d87f2029f7567eb0d7a096bb33016e 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -21,7 +21,6 @@ static int local_part (char *);
 static int domain (char *);
 static int route (char *);
 static int my_lex (char *);
-static int contains8bit (const char *);
 
 
 int
@@ -66,7 +65,7 @@ isat (const char *p)
  * getadrx() implements a partial 822-style address parser.  The parser
  * is neither complete nor correct.  It does however recognize nearly all
  * of the 822 address syntax.  In addition it handles the majority of the
- * 733 syntax as well.  Most problems arise from trying to accomodate both.
+ * 733 syntax as well.  Most problems arise from trying to accommodate both.
  *
  * In terms of 822, the route-specification in 
  *
@@ -235,8 +234,8 @@ getadrx (const char *addrs)
      * Reject the address if key fields contain 8bit characters
      */
 
-    if (contains8bit(mbox) || contains8bit(host) || contains8bit(path) ||
-       contains8bit(grp)) {
+    if (contains8bit(mbox, NULL) || contains8bit(host, NULL) ||
+       contains8bit(path, NULL) || contains8bit(grp, NULL)) {
        strcpy(err, "Address contains 8-bit characters");
     }
 
@@ -728,25 +727,6 @@ got_atom: ;
 }
 
 
-/*
- * Return true if the string contains an 8-bit character
- */
-
-static int
-contains8bit(const char *p)
-{
-    if (! p)
-       return 0;
-
-    for (; *p; p++) {
-       if (! isascii((unsigned char) *p))
-           return 1;
-    }
-
-    return 0;
-}
-
-
 char *
 legal_person (const char *p)
 {