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

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index ce14394e..23a7cb4c 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -11,6 +11,7 @@
 #include <h/addrsbr.h>
 #include <h/mf.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 /* High level parsing of addresses:
 
@@ -104,35 +105,32 @@ getname (const char *addrs)
 
 
 struct mailname *
-getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
+getm (char *str, char *dfhost, int dftype, char *eresult, size_t eresultsize)
 {
     char *pp;
     struct mailname *mp;
 
     if (err[0]) {
-	if (eresult)
-	    strcpy (eresult, err);
-	else
-	    if (wanthost == AD_HOST)
-		admonish (NULL, "bad address '%s' - %s", str, err);
+	if (eresult) {
+	    strncpy (eresult, err, eresultsize);
+	    eresult[eresultsize - 1] = '\0';
+	}
 	return NULL;
     }
     if (pers == NULL
 	    && mbox == NULL && host == NULL && route == NULL
 	    && grp == NULL) {
-	if (eresult)
-	    strcpy (eresult, "null address");
-	else
-	    if (wanthost == AD_HOST)
-		admonish (NULL, "null address '%s'", str);
+	if (eresult) {
+	    strncpy (eresult, "null address", eresultsize);
+	    eresult[eresultsize - 1] = '\0';
+	}
 	return NULL;
     }
     if (mbox == NULL && grp == NULL) {
-	if (eresult)
-	    strcpy (eresult, "no mailbox in address");
-	else
-	    if (wanthost == AD_HOST)
-		admonish (NULL, "no mailbox in address '%s'", str);
+	if (eresult) {
+	    strncpy (eresult, "no mailbox in address", eresultsize);
+	    eresult[eresultsize - 1] = '\0';
+	}
 	return NULL;
     }
 
@@ -141,13 +139,13 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 	dftype = LOCALHOST;
     }
 
-    mp = (struct mailname *) calloc ((size_t) 1, sizeof(*mp));
+    mp = (struct mailname *) mh_xcalloc ((size_t) 1, sizeof(*mp));
     if (mp == NULL) {
-	if (eresult)
-	   strcpy (eresult, "insufficient memory to represent address");
-	else
-	    if (wanthost == AD_HOST)
-		adios (NULL, "insufficient memory to represent address");
+	if (eresult) {
+	    strncpy (eresult, "insufficient memory to represent address",
+	   	     eresultsize);
+	    eresult[eresultsize - 1] = '\0';
+	}
 	return NULL;
     }
 
@@ -274,24 +272,6 @@ auxformat (struct mailname *mp, int extras)
 }
 
 
-/*
- * This used to be adrsprintf() (where it would format an address for you
- * given a username and a domain).  But somewhere we got to the point where
- * the only caller was post, and it only called it with both arguments NULL.
- * So the function was renamed with a more sensible name.
- */
-
-char *
-getlocaladdr(void)
-{
-    char	 *username;
-
-    username = getusername();
-
-    return username;
-}
-
-
 #define	W_NIL	0x0000
 #define	W_MBEG	0x0001
 #define	W_MEND	0x0002
@@ -335,7 +315,7 @@ ismymbox (struct mailname *np)
 		return 0;
 	    }
 
-	    if ((mq.m_next = getm (cp, NULL, 0, AD_NAME, NULL)) == NULL) {
+	    if ((mq.m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
 	    	admonish (NULL, "invalid entry in local-mailbox: %s", cp);
 		return 0;
 	    }
@@ -355,7 +335,7 @@ ismymbox (struct mailname *np)
 	    mp = mq.m_next ? mq.m_next : &mq;
 	    oops = 0;
 	    while ((cp = getname (am))) {
-		if ((mp->m_next = getm (cp, NULL, 0, AD_NAME, NULL)) == NULL) {
+		if ((mp->m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
 		    admonish (NULL, "illegal address: %s", cp);
 		    oops++;
 		} else {
@@ -457,7 +437,7 @@ local_test: ;
 
 	if (mp->m_nohost)
 	    return 1;
-	if (np->m_host == NULL)
+	if (np->m_host == NULL || mp->m_host == NULL)
 	    continue;
 	if ((len = strlen (cp = np->m_host))
 		< (i = strlen (pp = mp->m_host)))