X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/259e3f06a43ed7a515acc5937c671d4876ecc300..a1dcc0bd9e1ffd90ef88cd19f8ff8197f541c8a8:/sbr/mf.c?ds=sidebyside

diff --git a/sbr/mf.c b/sbr/mf.c
index c11b0c10..fa281766 100644
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -174,11 +174,12 @@ static char adr[BUFSIZ];
 static struct adrx  adrxs2;
 
 
+/* eai = Email Address Internationalization */
 struct adrx *
-getadrx (const char *addrs)
+getadrx (const char *addrs, int eai)
 {
-    register char *bp;
-    register struct adrx *adrxp = &adrxs2;
+    char *bp;
+    struct adrx *adrxp = &adrxs2;
 
     if (pers)
 	free (pers);
@@ -230,13 +231,15 @@ getadrx (const char *addrs)
 	    break;
 	}
 
-    /*
-     * Reject the address if key fields contain 8bit characters
-     */
+    if (! eai) {
+        /*
+         * Reject the address if key fields contain 8bit characters
+         */
 
-    if (contains8bit(mbox, NULL) || contains8bit(host, NULL) ||
-	contains8bit(path, NULL) || contains8bit(grp, NULL)) {
-    	strcpy(err, "Address contains 8-bit characters");
+        if (contains8bit(mbox, NULL) || contains8bit(host, NULL) ||
+            contains8bit(path, NULL) || contains8bit(grp, NULL)) {
+            strcpy(err, "Address contains 8-bit characters");
+        }
     }
 
     if (err[0])
@@ -255,7 +258,7 @@ getadrx (const char *addrs)
     while (isspace ((unsigned char) *ap))
 	ap++;
     if (cp)
-	sprintf (adr, "%.*s", (int)(cp - ap), ap);
+	snprintf(adr, sizeof adr, "%.*s", (int)(cp - ap), ap);
     else
 	strcpy (adr, ap);
     bp = adr + strlen (adr) - 1;
@@ -314,7 +317,7 @@ again: ;
 	    return OK;		/* why be choosy? */
 
 	default: 
-	    sprintf (err, "illegal address construct (%s)", buffer);
+	    snprintf(err, sizeof err, "illegal address construct (%s)", buffer);
 	    return NOTOK;
     }
 
@@ -333,13 +336,13 @@ again: ;
 			return NOTOK;
 		    if (last_lex == LX_RBRK)
 			return OK;
-		    sprintf (err, "missing right-bracket (%s)", buffer);
+		    snprintf(err, sizeof err, "missing right-bracket (%s)", buffer);
 		    return NOTOK;
 
 		case LX_COLN: 
 	    get_group: ;
 		    if (glevel++ > 0) {
-			sprintf (err, "nested groups not allowed (%s)", pers);
+			snprintf(err, sizeof err, "nested groups not allowed (%s)", pers);
 			return NOTOK;
 		    }
 		    grp = add (": ", pers);
@@ -368,7 +371,7 @@ again: ;
 		    goto more_phrase;
 
 		default: 
-		    sprintf (err, "no mailbox in address, only a phrase (%s%s)",
+		    snprintf(err, sizeof err, "no mailbox in address, only a phrase (%s%s)",
 			    pers, buffer);
 		    return NOTOK;
 	    }
@@ -404,7 +407,7 @@ again: ;
 		    return OK;
 
 		default: 
-		    sprintf (err, "junk after local@domain (%s)", buffer);
+		    snprintf(err, sizeof err, "junk after local@domain (%s)", buffer);
 		    return NOTOK;
 	    }
 
@@ -421,7 +424,7 @@ again: ;
 	    return OK;
 
 	default: 
-	    sprintf (err, "missing mailbox (%s)", buffer);
+	    snprintf(err, sizeof err, "missing mailbox (%s)", buffer);
 	    return NOTOK;
     }
 }
@@ -446,7 +449,7 @@ phrase (char *buffer)
 static int
 route_addr (char *buffer)
 {
-    register char *pp = cp;
+    char *pp = cp;
 
     if (my_lex (buffer) == LX_AT) {
 	if (route (buffer) == NOTOK)
@@ -469,7 +472,7 @@ route_addr (char *buffer)
 	    return OK;
 
 	default: 
-	    sprintf (err, "no at-sign after local-part (%s)", buffer);
+	    snprintf(err, sizeof err, "no at-sign after local-part (%s)", buffer);
 	    return NOTOK;
     }
 }
@@ -488,7 +491,7 @@ local_part (char *buffer)
 		break;
 
 	    default: 
-		sprintf (err, "no mailbox in local-part (%s)", buffer);
+		snprintf(err, sizeof err, "no mailbox in local-part (%s)", buffer);
 		return NOTOK;
 	}
 
@@ -515,7 +518,7 @@ domain (char *buffer)
 		break;
 
 	    default: 
-		sprintf (err, "no sub-domain in domain-part of address (%s)", buffer);
+		snprintf(err, sizeof err, "no sub-domain in domain-part of address (%s)", buffer);
 		return NOTOK;
 	}
 
@@ -550,7 +553,7 @@ route (char *buffer)
 		break;
 
 	    default: 
-		sprintf (err, "no sub-domain in domain-part of address (%s)", buffer);
+		snprintf(err, sizeof err, "no sub-domain in domain-part of address (%s)", buffer);
 		return NOTOK;
 	}
 	switch (my_lex (buffer)) {
@@ -566,7 +569,7 @@ route (char *buffer)
 			    break;
 
 			default: 
-			    sprintf (err, "no at-sign found for next domain in route (%s)",
+			    snprintf(err, sizeof err, "no at-sign found for next domain in route (%s)",
 			             buffer);
 		    }
 		    break;
@@ -583,7 +586,7 @@ route (char *buffer)
 		return OK;
 
 	    default: 
-		sprintf (err, "no colon found to terminate route (%s)", buffer);
+		snprintf(err, sizeof err, "no colon found to terminate route (%s)", buffer);
 		return NOTOK;
 	}
     }
@@ -731,7 +734,7 @@ char *
 legal_person (const char *p)
 {
     int i;
-    register const char *cp;
+    const char *cp;
     static char buffer[BUFSIZ];
 
     if (*p == '"')
@@ -739,7 +742,7 @@ legal_person (const char *p)
     for (cp = p; *cp; cp++)
 	for (i = 0; special[i].lx_chr; i++)
 	    if (*cp == special[i].lx_chr) {
-		sprintf (buffer, "\"%s\"", p);
+		snprintf(buffer, sizeof buffer, "\"%s\"", p);
 		return buffer;
 	    }
 
@@ -751,7 +754,7 @@ int
 mfgets (FILE *in, char **bp)
 {
     int i;
-    register char *cp, *dp, *ep;
+    char *cp, *dp, *ep;
     static int len = 0;
     static char *pp = NULL;