initialize mp in ismymbox

[mmh] / sbr / addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 4876d09..201e816 100644 (file)
--- 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,13 +237,13 @@ 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;
-       static struct mailname mq={NULL};
+       static struct mailname mq;
 
        /*
        ** If this is the first call, initialize
@@ -250,10 +252,10 @@ ismymbox(struct mailname *np)
        if (am == NULL) {
                mq.m_next = NULL;
                mq.m_mbox = getusername();
-               if ((am = context_find("alternate-mailboxes")) == NULL)
+               mp = &mq;
+               if ((am = context_find("alternate-mailboxes")) == NULL) {
                        am = getusername();
-               else {
-                       mp = &mq;
+               } else {
                        oops = 0;
                        while ((cp = getname(am))) {
                                if ((mp->m_next = getm(cp, NULL, 0, AD_NAME, NULL)) == NULL) {
@@ -280,15 +282,45 @@ ismymbox(struct mailname *np)
                                                        *cp = '\0';
                                                }
                                        }
-                                       if ((cp = getenv("MHWDEBUG")) && *cp)
+                                       if ((cp = getenv("MHWDEBUG")) && *cp) {
                                                fprintf(stderr, "mbox=\"%s\" host=\"%s\" %s\n",
                                                        mp->m_mbox, mp->m_host,
                                                        snprintb(buffer, sizeof(buffer), (unsigned) mp->m_type, WBITS));
+                                       }
                                }
                        }
-                       if (oops)
+                       if (oops != 0) {
                                advise(NULL, "please fix the profile entry %s",
                                                "alternate-mailboxes");
+                       }
+               }
+
+               if ((cp = context_find("Default-From")) != NULL) {
+                       int i = 0;
+                       char *cp2;
+                       oops = 0;
+
+                       while ((cp2 = getname(cp)) != NULL) {
+                               i++;
+                               if ((mp->m_next = getm(cp2, NULL, 0, AD_NAME, NULL)) == NULL) {
+                                       admonish(NULL, "illegal address: %s", cp);
+                                       oops++;
+                               } else {
+                                       mp = mp->m_next;
+                                       if ((cp = getenv("MHWDEBUG")) && *cp) {
+                                               fprintf(stderr, "mbox=\"%s\" host=\"%s\" %s\n",
+                                                       mp->m_mbox, mp->m_host,
+                                                       snprintb(buffer, sizeof(buffer), (unsigned) mp->m_type, WBITS));
+                                       }
+                               }
+
+                       }
+
+                       if (oops != 0 || i < 1) {
+                               advise(NULL, "please fix the profile entry %s",
+                                               "Default-From");
+                       }
+
                }
        }
 
@@ -372,3 +404,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;
+}