X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=09ea1311e1ea97d5877bc4602dec8c159805341c;hb=850059f6637354d31129f303151f9f7d30514c9e;hp=e75908877882a8f353a5cad5b56bf5909f92a333;hpb=517661967774d60716ecff152c642b417195f900;p=mmh

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index e759088..09ea131 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -6,7 +6,9 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/addrsbr.h>
 #include <h/mf.h>
 
@@ -102,12 +104,12 @@ 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");
+			adios(EX_OSERR, NULL, "insufficient memory to represent address");
 		return NULL;
 	}
 
@@ -235,9 +237,9 @@ int
 ismymbox(struct mailname *np)
 {
 	int oops;
-	register int len, i;
-	register char *cp;
-	register char *pp;
+	int len, i;
+	char *cp;
+	char *pp;
 	char buffer[BUFSIZ];
 	struct mailname *mp;
 	static char *am = NULL;
@@ -372,3 +374,28 @@ local_test: ;
 
 	return 0;
 }
+
+/*
+ * Insert mailname after element and returns the
+ * number of parsed addresses. element is set to
+ * the last parsed addresse.
+ */
+size_t
+getmboxes(char *line, struct mailname **element)
+{
+	struct mailname *mp, *next;
+	char *cp;
+	size_t i = 0;
+
+	next = (*element)->m_next;
+
+	while ((cp = getname(line))) {
+		mp = getm(cp, NULL, 0, AD_HOST, NULL);
+		(*element)->m_next = mp;
+		*element = mp;
+		i++;
+	}
+
+	(*element)->m_next = next;
+	return i;
+}