X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=8a468bbb141b72c3086e15801236fa55076ddb67;hb=d6bc0d17efe54a1dd7110547aae4b1bb6e223bb7;hp=09e4c6c569a61c9419a81f72a076cf9c33745d1d;hpb=3adc6332ad97bf689bcfb8ab5fd45c86a6051a77;p=mmh

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 09e4c6c..8a468bb 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -2,8 +2,6 @@
 /*
  * addrsbr.c -- parse addresses 822-style
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -19,6 +17,9 @@
    addresses.  The routines in sbr/addrsbr.c associate semantics with those
    addresses.  
 
+   The comments below are left in for historical purposes; DUMB and
+   REALLYDUMB are now the default in the code.
+
    If #ifdef DUMB is in effect, a full 822-style parser is called
    for syntax recongition.  This breaks each address into its components.
    Note however that no semantics are assumed about the parts or their
@@ -115,9 +116,6 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 {
     char *pp;
     struct mailname *mp;
-#ifndef	DUMB
-    char *dp;
-#endif /* not DUMB */
 
     if (err[0]) {
 	if (eresult)
@@ -147,7 +145,7 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
     }
 
     if (dfhost == NULL) {
-	dfhost = LocalName ();
+	dfhost = LocalName (0);
 	dftype = LOCALHOST;
     }
 
@@ -190,13 +188,11 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 	else {
 	    mp->m_nohost = 1;
 	    mp->m_mbox = getcpy (mbox);
-#ifdef DUMB
 	    if (route == NULL && dftype == LOCALHOST) {
 		mp->m_host = NULL;
 		mp->m_type = dftype;
 	    }
 	    else
-#endif /* DUMB */
 	    {
 		mp->m_host = route ? NULL : getcpy (dfhost);
 		mp->m_type = route ? NETHOST : dftype;
@@ -206,29 +202,10 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
     }
 
     if (wanthost == AD_NHST)
-	mp->m_type = !mh_strcasecmp (LocalName (), mp->m_host)
+	mp->m_type = !mh_strcasecmp (LocalName (0), mp->m_host)
 	    ? LOCALHOST : NETHOST;
-#ifdef DUMB
     else
-	mp->m_type = mh_strcasecmp (LocalName(), mp->m_host) ?  NETHOST : LOCALHOST;
-#else /* not DUMB */
-    else
-	if (pp = OfficialName (mp->m_host)) {
-    got_real_host: ;
-	    free (mp->m_host);
-	    mp->m_host = getcpy (pp);
-	    mp->m_type = mh_strcasecmp (LocalName(), mp->m_host) ? NETHOST : LOCALHOST;
-	}
-	else {
-	    if (dp = strchr(mp->m_host, '.')) {
-		*dp = NULL;
-		if (pp = OfficialName (mp->m_host))
-		    goto got_real_host;
-		*dp = '.';
-	    }
-	    mp->m_type = BADHOST;
-	}
-#endif /* not DUMB */
+	mp->m_type = mh_strcasecmp (LocalName(0), mp->m_host) ?  NETHOST : LOCALHOST;
 
 got_host: ;
     if (route)
@@ -276,18 +253,14 @@ auxformat (struct mailname *mp, int extras)
     static char addr[BUFSIZ];
     static char buffer[BUFSIZ];
 
-#ifdef DUMB
 	if (mp->m_nohost)
 	    strncpy (addr, mp->m_mbox ? mp->m_mbox : "", sizeof(addr));
 	else
-#endif /* DUMB */
 
-#ifndef	BANG
 	if (mp->m_type != UUCPHOST)
 	    snprintf (addr, sizeof(addr), mp->m_host ? "%s%s@%s" : "%s%s",
 		empty(mp->m_path), empty(mp->m_mbox), mp->m_host);
 	else
-#endif /* not BANG */
 	    snprintf (addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox);
 
     if (!extras)
@@ -314,17 +287,20 @@ auxformat (struct mailname *mp, int extras)
 
 
 /*
- * address specific "sprintf"
+ * 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 *
-adrsprintf (char *username, char *domain)
+getlocaladdr(void)
 {
     int          snprintf_return;
+    char	 *username, *domain;
     static char  addr[BUFSIZ];
 
-    if (username == NULL)
-	username = getusername();
+    username = getusername();
 
     if (username_extension_masquerading) {
 	/* mts.conf contains "masquerade:[...]username_extension[...]", so tack
@@ -339,7 +315,7 @@ adrsprintf (char *username, char *domain)
 				       "%s%s", username, extension);
 	    
 	    if (snprintf_return < 0 ||
-		snprintf_return >= sizeof(username_with_extension))
+		snprintf_return >= (int) sizeof(username_with_extension))
 		adios(NULL, "snprintf() error writing username (%d chars) and"
 		      " $USERNAME_EXTENSION (%d chars) to array of BUFSIZ (%d)"
 		      " chars",
@@ -349,20 +325,13 @@ adrsprintf (char *username, char *domain)
 	}
     }
 
-#ifdef REALLYDUMB
     return username;
-#endif
 
-    if (domain == NULL)
-	domain = LocalName();
+    domain = LocalName(0);
 
-#ifndef	BANG
     snprintf_return = snprintf (addr, sizeof(addr), "%s@%s", username, domain);
-#else /* BANG */
-    snprintf_return = snprintf (addr, sizeof(addr), "%s!%s", domain, username);
-#endif /* BANG */
 
-    if (snprintf_return < 0 || snprintf_return >= sizeof(addr))
+    if (snprintf_return < 0 || snprintf_return >= (int) sizeof(addr))
 	adios(NULL, "snprintf() error writing username (%d chars), domain (%d"
 	      " chars), and 1 separator char to array of BUFSIZ (%d) chars",
 	      strlen(username), strlen(domain), BUFSIZ);
@@ -394,7 +363,7 @@ ismymbox (struct mailname *np)
     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
@@ -450,7 +419,7 @@ ismymbox (struct mailname *np)
     
     switch (np->m_type) {
 	case NETHOST:
-	    len = strlen (cp = LocalName ());
+	    len = strlen (cp = LocalName (0));
 	    if (!uprf (np->m_host, cp) || np->m_host[len] != '.')
 		break;
 	    goto local_test;