X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f29bbf35b2de1893a3e383943f813cbc4f41960b..c4db59aa4b58bca9cd146ae30f507c16218a67d7:/sbr/addrsbr.c?ds=sidebyside

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index f8b98f23..70ddb8db 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -76,17 +76,22 @@ static char *grp = NULL;
 static char *note = NULL;
 static char err[BUFSIZ];
 static char adr[BUFSIZ];
+static int eai = 0;
+
+void
+enable_eai() {
+    eai = 1;
+}
 
 
 char *
 getname (const char *addrs)
 {
     struct adrx *ap;
-    const char *const eai = context_find ("eai");
     pers = mbox = host = route = grp = note = NULL;
     err[0] = '\0';
 
-    if ((ap = getadrx (addrs ? addrs : "", eai && strncasecmp (eai, "utf-8", 5) == 0)) == NULL) {
+    if ((ap = getadrx (addrs ? addrs : "", eai)) == NULL) {
 	return NULL;
     }
 
@@ -140,16 +145,7 @@ getm (char *str, char *dfhost, int dftype, char *eresult, size_t eresultsize)
 	dftype = LOCALHOST;
     }
 
-    mp = (struct mailname *) mh_xcalloc ((size_t) 1, sizeof(*mp));
-    if (mp == NULL) {
-	if (eresult) {
-	    strncpy (eresult, "insufficient memory to represent address",
-	   	     eresultsize);
-	    eresult[eresultsize - 1] = '\0';
-	}
-	return NULL;
-    }
-
+    NEW0(mp);
     mp->m_next = NULL;
     mp->m_text = getcpy (str);
     if (pers)