X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=7d1350e995289f70a6d212e39f9dd0458fd174f9;hb=13ae9ba066e6b8c114daa6714895a56816465f49;hp=cf941dc5b6e30d555de2afa0b56b4c0aa3b7c2f1;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68;p=mmh

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index cf941dc..7d1350e 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,11 +116,8 @@ 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 && err[0]) {
+    if (err[0]) {
 	if (eresult)
 	    strcpy (eresult, err);
 	else
@@ -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 = !strcasecmp (LocalName (), mp->m_host)
+	mp->m_type = !mh_strcasecmp (LocalName (), mp->m_host)
 	    ? LOCALHOST : NETHOST;
-#ifdef DUMB
     else
-	mp->m_type = 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 = 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(), 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)
@@ -339,7 +312,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 +322,14 @@ adrsprintf (char *username, char *domain)
 	}
     }
 
-#ifdef REALLYDUMB
     return username;
-#endif
 
     if (domain == NULL)
 	domain = LocalName();
 
-#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 +361,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
@@ -456,11 +423,11 @@ ismymbox (struct mailname *np)
 	    goto local_test;
 
 	case UUCPHOST:
-	    if (strcasecmp (np->m_host, SystemName()))
+	    if (mh_strcasecmp (np->m_host, SystemName()))
 		break;		/* fall */
 	case LOCALHOST:
 local_test: ;
-	    if (!strcasecmp (np->m_mbox, mq.m_mbox))
+	    if (!mh_strcasecmp (np->m_mbox, mq.m_mbox))
 		return 1;
 	    break;
 
@@ -481,11 +448,11 @@ local_test: ;
 	    continue;
 	switch (mp->m_type & W_MBOX) {
 	    case W_NIL: 
-		if (strcasecmp (cp, pp))
+		if (mh_strcasecmp (cp, pp))
 		    continue;
 		break;
 	    case W_MBEG: 
-		if (strcasecmp (cp + len - i, pp))
+		if (mh_strcasecmp (cp + len - i, pp))
 		    continue;
 		break;
 	    case W_MEND: 
@@ -507,11 +474,11 @@ local_test: ;
 	    continue;
 	switch (mp->m_type & W_HOST) {
 	    case W_NIL: 
-		if (strcasecmp (cp, pp))
+		if (mh_strcasecmp (cp, pp))
 		    continue;
 		break;
 	    case W_HBEG: 
-		if (strcasecmp (cp + len - i, pp))
+		if (mh_strcasecmp (cp + len - i, pp))
 		    continue;
 		break;
 	    case W_HEND: