X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/487ad115de1c5a97ab4e61bbf3f3bbbdbd97b258..2e9ce3236ae4bdbb7d41d297faf063c564d39f6c:/sbr/addrsbr.c?ds=inline

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index bb0b2c78..e5b20520 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -78,7 +78,7 @@ static char adr[BUFSIZ];
 
 
 char *
-getname (char *addrs)
+getname (const char *addrs)
 {
     struct adrx *ap;
 
@@ -242,10 +242,13 @@ auxformat (struct mailname *mp, int extras)
 	    strncpy (addr, mp->m_mbox ? mp->m_mbox : "", sizeof(addr));
 	else
 
-	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
+	if (mp->m_type != UUCPHOST) {
+	    if (mp->m_host)
+	    	snprintf (addr, sizeof(addr), "%s%s@%s", empty(mp->m_path),
+			  empty(mp->m_mbox), mp->m_host);
+	    else snprintf (addr, sizeof(addr), "%s%s", empty(mp->m_path),
+	    		   empty(mp->m_mbox));
+	} else
 	    snprintf (addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox);
 
     if (!extras)
@@ -271,24 +274,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