X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=df81839d4e5c259e58e3dd2908d05004a315bda5;hp=c8eb0c816b7e81afdf8ab34186630c63b58d66dc;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index c8eb0c8..df81839 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -79,21 +79,21 @@ extern boolean  username_extension_masquerading;  /* defined in mts.c */
 /*
 ** external prototypes
 */
-char *getusername (void);
+char *getusername(void);
 
 
 char *
-getname (char *addrs)
+getname(char *addrs)
 {
 	struct adrx *ap;
 
 	pers = mbox = host = route = grp = note = NULL;
 	err[0] = '\0';
 
-	if ((ap = getadrx (addrs ? addrs : "")) == NULL)
+	if ((ap = getadrx(addrs ? addrs : "")) == NULL)
 		return NULL;
 
-	strncpy (adr, ap->text, sizeof(adr));
+	strncpy(adr, ap->text, sizeof(adr));
 	pers = ap->pers;
 	mbox = ap->mbox;
 	host = ap->host;
@@ -102,14 +102,14 @@ getname (char *addrs)
 	ingrp = ap->ingrp;
 	note = ap->note;
 	if (ap->err && *ap->err)
-		strncpy (err, ap->err, sizeof(err));
+		strncpy(err, ap->err, sizeof(err));
 
 	return adr;
 }
 
 
 struct mailname *
-getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
+getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 {
 	char *pp;
 	struct mailname *mp;
@@ -119,70 +119,70 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 
 	if (err[0]) {
 		if (eresult)
-			strcpy (eresult, err);
+			strcpy(eresult, err);
 		else
 			if (wanthost == AD_HOST)
-				admonish (NULL, "bad address '%s' - %s", str, err);
+				admonish(NULL, "bad address '%s' - %s", str, err);
 		return NULL;
 	}
 	if (pers == NULL && mbox == NULL && host == NULL && route == NULL
 		&& grp == NULL) {
 		if (eresult)
-			strcpy (eresult, "null address");
+			strcpy(eresult, "null address");
 		else
 			if (wanthost == AD_HOST)
-				admonish (NULL, "null address '%s'", str);
+				admonish(NULL, "null address '%s'", str);
 		return NULL;
 	}
 	if (mbox == NULL && grp == NULL) {
 		if (eresult)
-			strcpy (eresult, "no mailbox in address");
+			strcpy(eresult, "no mailbox in address");
 		else if (wanthost == AD_HOST)
-			admonish (NULL, "no mailbox in address '%s'", str);
+			admonish(NULL, "no mailbox in address '%s'", str);
 		return NULL;
 	}
 
 	if (dfhost == NULL) {
-		dfhost = LocalName ();
+		dfhost = LocalName();
 		dftype = LOCALHOST;
 	}
 
-	mp = (struct mailname *) calloc ((size_t) 1, sizeof(*mp));
+	mp = (struct mailname *) calloc((size_t) 1, sizeof(*mp));
 	if (mp == NULL) {
 		if (eresult)
-			strcpy (eresult, "insufficient memory to represent address");
+			strcpy(eresult, "insufficient memory to represent address");
 		else if (wanthost == AD_HOST)
-			adios (NULL, "insufficient memory to represent address");
+			adios(NULL, "insufficient memory to represent address");
 		return NULL;
 	}
 
 	mp->m_next = NULL;
-	mp->m_text = getcpy (str);
+	mp->m_text = getcpy(str);
 	if (pers)
-		mp->m_pers = getcpy (pers);
+		mp->m_pers = getcpy(pers);
 
 	if (mbox == NULL) {
 		mp->m_type = BADHOST;
 		mp->m_nohost = 1;
 		mp->m_ingrp = ingrp;
-		mp->m_gname = getcpy (grp);
+		mp->m_gname = getcpy(grp);
 		if (note)
-			mp->m_note = getcpy (note);
+			mp->m_note = getcpy(note);
 		return mp;
 	}
 
 	if (host) {
-		mp->m_mbox = getcpy (mbox);
-		mp->m_host = getcpy (host);
+		mp->m_mbox = getcpy(mbox);
+		mp->m_host = getcpy(host);
 	} else {
 		if ((pp = strchr(mbox, '!'))) {
 			*pp++ = '\0';
-			mp->m_mbox = getcpy (pp);
-			mp->m_host = getcpy (mbox);
+			mp->m_mbox = getcpy(pp);
+			mp->m_host = getcpy(mbox);
 			mp->m_type = UUCPHOST;
 		} else {
 			mp->m_nohost = 1;
-			mp->m_mbox = getcpy (mbox);
+			mp->m_mbox = getcpy(mbox);
 #ifdef DUMB
 			if (route == NULL && dftype == LOCALHOST) {
 				mp->m_host = NULL;
@@ -190,7 +190,7 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 			} else
 #endif /* DUMB */
 			{
-				mp->m_host = route ? NULL : getcpy (dfhost);
+				mp->m_host = route ? NULL : getcpy(dfhost);
 				mp->m_type = route ? NETHOST : dftype;
 			}
 		}
@@ -198,22 +198,22 @@ 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(), mp->m_host)
 			? LOCALHOST : NETHOST;
 #ifdef DUMB
 	else
-		mp->m_type = mh_strcasecmp (LocalName(), mp->m_host) ?  NETHOST : LOCALHOST;
+		mp->m_type = mh_strcasecmp(LocalName(), mp->m_host) ?  NETHOST : LOCALHOST;
 #else /* not DUMB */
 	else
-		if (pp = OfficialName (mp->m_host)) {
+		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;
+			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))
+				if (pp = OfficialName(mp->m_host))
 					goto got_real_host;
 				*dp = '.';
 			}
@@ -223,77 +223,77 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 
 got_host: ;
 	if (route)
-		mp->m_path = getcpy (route);
+		mp->m_path = getcpy(route);
 	mp->m_ingrp = ingrp;
 	if (grp)
-		mp->m_gname = getcpy (grp);
+		mp->m_gname = getcpy(grp);
 	if (note)
-		mp->m_note = getcpy (note);
+		mp->m_note = getcpy(note);
 
 	return mp;
 }
 
 
 void
-mnfree (struct mailname *mp)
+mnfree(struct mailname *mp)
 {
 	if (!mp)
 		return;
 
 	if (mp->m_text)
-		free (mp->m_text);
+		free(mp->m_text);
 	if (mp->m_pers)
-		free (mp->m_pers);
+		free(mp->m_pers);
 	if (mp->m_mbox)
-		free (mp->m_mbox);
+		free(mp->m_mbox);
 	if (mp->m_host)
-		free (mp->m_host);
+		free(mp->m_host);
 	if (mp->m_path)
-		free (mp->m_path);
+		free(mp->m_path);
 	if (mp->m_gname)
-		free (mp->m_gname);
+		free(mp->m_gname);
 	if (mp->m_note)
-		free (mp->m_note);
+		free(mp->m_note);
 
-	free ((char *) mp);
+	free((char *) mp);
 }
 
 
 #define empty(s) ((s) ? (s) : "")
 
 char *
-adrformat (struct mailname *mp)
+adrformat(struct mailname *mp)
 {
 	static char addr[BUFSIZ];
 	static char buffer[BUFSIZ];
 
 #ifdef DUMB
 	if (mp->m_nohost)
-		strncpy (addr, mp->m_mbox ? mp->m_mbox : "", sizeof(addr));
+		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",
+		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);
+		snprintf(addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox);
 
 	if (mp->m_pers || mp->m_path) {
 		if (mp->m_note)
-			snprintf (buffer, sizeof(buffer), "%s %s <%s>",
-				legal_person (mp->m_pers ? mp->m_pers : mp->m_mbox),
+			snprintf(buffer, sizeof(buffer), "%s %s <%s>",
+				legal_person(mp->m_pers ? mp->m_pers : mp->m_mbox),
 				mp->m_note, addr);
 		else
-			snprintf (buffer, sizeof(buffer), "%s <%s>",
-				legal_person (mp->m_pers ? mp->m_pers : mp->m_mbox),
+			snprintf(buffer, sizeof(buffer), "%s <%s>",
+				legal_person(mp->m_pers ? mp->m_pers : mp->m_mbox),
 				addr);
 	} else if (mp->m_note)
-		snprintf (buffer, sizeof(buffer), "%s %s", addr, mp->m_note);
+		snprintf(buffer, sizeof(buffer), "%s %s", addr, mp->m_note);
 	else
-		strncpy (buffer, addr, sizeof(buffer));
+		strncpy(buffer, addr, sizeof(buffer));
 
 	return buffer;
 }
@@ -313,7 +313,7 @@ adrformat (struct mailname *mp)
 */
 
 int
-ismymbox (struct mailname *np)
+ismymbox(struct mailname *np)
 {
 	int oops;
 	register int len, i;
@@ -330,15 +330,15 @@ ismymbox (struct mailname *np)
 	*/
 	if (am == NULL) {
 		mq.m_next = NULL;
-		mq.m_mbox = getusername ();
-		if ((am = context_find ("alternate-mailboxes")) == NULL)
+		mq.m_mbox = getusername();
+		if ((am = context_find("alternate-mailboxes")) == NULL)
 			am = getusername();
 		else {
 			mp = &mq;
 			oops = 0;
-			while ((cp = getname (am))) {
-				if ((mp->m_next = getm (cp, NULL, 0, AD_NAME, NULL)) == NULL) {
-					admonish (NULL, "illegal address: %s", cp);
+			while ((cp = getname(am))) {
+				if ((mp->m_next = getm(cp, NULL, 0, AD_NAME, NULL)) == NULL) {
+					admonish(NULL, "illegal address: %s", cp);
 					oops++;
 				} else {
 					mp = mp->m_next;
@@ -347,7 +347,7 @@ ismymbox (struct mailname *np)
 						mp->m_type |= W_MBEG;
 						mp->m_mbox++;
 					}
-					if (*(cp = mp->m_mbox + strlen (mp->m_mbox) - 1) == '*') {
+					if (*(cp = mp->m_mbox + strlen(mp->m_mbox) - 1) == '*') {
 						mp->m_type |= W_MEND;
 						*cp = '\0';
 					}
@@ -356,19 +356,19 @@ ismymbox (struct mailname *np)
 							mp->m_type |= W_HBEG;
 							mp->m_host++;
 						}
-						if (*(cp = mp->m_host + strlen (mp->m_host) - 1) == '*') {
+						if (*(cp = mp->m_host + strlen(mp->m_host) - 1) == '*') {
 							mp->m_type |= W_HEND;
 							*cp = '\0';
 						}
 					}
-					if ((cp = getenv ("MHWDEBUG")) && *cp)
-						fprintf (stderr, "mbox=\"%s\" host=\"%s\" %s\n",
+					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));
+							snprintb(buffer, sizeof(buffer), (unsigned) mp->m_type, WBITS));
 				}
 			}
 			if (oops)
-				advise (NULL, "please fix the %s: entry in your %s file",
+				advise(NULL, "please fix the %s: entry in your %s file",
 					"alternate-mailboxes", mh_profile);
 		}
 	}
@@ -378,17 +378,17 @@ ismymbox (struct mailname *np)
 
 	switch (np->m_type) {
 		case NETHOST:
-			len = strlen (cp = LocalName ());
-			if (!uprf (np->m_host, cp) || np->m_host[len] != '.')
+			len = strlen(cp = LocalName());
+			if (!uprf(np->m_host, cp) || np->m_host[len] != '.')
 				break;
 			goto local_test;
 
 		case UUCPHOST:
-			if (mh_strcasecmp (np->m_host, SystemName()))
+			if (mh_strcasecmp(np->m_host, SystemName()))
 				break;  /* fall */
 		case LOCALHOST:
 local_test: ;
-			if (!mh_strcasecmp (np->m_mbox, mq.m_mbox))
+			if (!mh_strcasecmp(np->m_mbox, mq.m_mbox))
 				return 1;
 			break;
 
@@ -404,24 +404,24 @@ local_test: ;
 		mp = mp->m_next;
 		if (!np->m_mbox)
 			continue;
-		if ((len = strlen (cp = np->m_mbox))
-			< (i = strlen (pp = mp->m_mbox)))
+		if ((len = strlen(cp = np->m_mbox))
+			< (i = strlen(pp = mp->m_mbox)))
 			continue;
 		switch (mp->m_type & W_MBOX) {
 			case W_NIL:
-				if (mh_strcasecmp (cp, pp))
+				if (mh_strcasecmp(cp, pp))
 					continue;
 				break;
 			case W_MBEG:
-				if (mh_strcasecmp (cp + len - i, pp))
+				if (mh_strcasecmp(cp + len - i, pp))
 					continue;
 				break;
 			case W_MEND:
-				if (!uprf (cp, pp))
+				if (!uprf(cp, pp))
 					continue;
 				break;
 			case W_MBEG | W_MEND:
-				if (stringdex (pp, cp) < 0)
+				if (stringdex(pp, cp) < 0)
 					continue;
 				break;
 		}
@@ -430,12 +430,12 @@ local_test: ;
 			return 1;
 		if (np->m_host == NULL)
 			continue;
-		if ((len = strlen (cp = np->m_host))
-			< (i = strlen (pp = mp->m_host)))
+		if ((len = strlen(cp = np->m_host))
+			< (i = strlen(pp = mp->m_host)))
 			continue;
 		switch (mp->m_type & W_HOST) {
 			case W_NIL:
-				if (mh_strcasecmp (cp, pp))
+				if (mh_strcasecmp(cp, pp))
 					continue;
 				break;
 			case W_HBEG:
@@ -443,11 +443,11 @@ local_test: ;
 					continue;
 				break;
 			case W_HEND:
-				if (!uprf (cp, pp))
+				if (!uprf(cp, pp))
 					continue;
 				break;
 			case W_HBEG | W_HEND:
-				if (stringdex (pp, cp) < 0)
+				if (stringdex(pp, cp) < 0)
 					continue;
 				break;
 		}
@@ -474,7 +474,7 @@ local_test: ;
 
 
 char *
-OfficialName (char *name)
+OfficialName(char *name)
 {
 	unsigned char *p;
 	char *q, site[BUFSIZ];
@@ -483,11 +483,11 @@ OfficialName (char *name)
 	static char buffer[BUFSIZ];
 
 	for (p = name, q = site; *p && (q - site < sizeof(site) - 1); p++, q++)
-		*q = isupper (*p) ? tolower (*p) : *p;
+		*q = isupper(*p) ? tolower(*p) : *p;
 	*q = '\0';
 	q = site;
 
-	if (!mh_strcasecmp (LocalName(), site))
+	if (!mh_strcasecmp(LocalName(), site))
 		return LocalName();
 
 	memset(&hints, 0, sizeof(hints));
@@ -495,12 +495,12 @@ OfficialName (char *name)
 	hints.ai_family = PF_UNSPEC;
 
 	if (getaddrinfo(q, NULL, &hints, &res) == 0) {
-		strncpy (buffer, res->ai_canonname, sizeof(buffer));
+		strncpy(buffer, res->ai_canonname, sizeof(buffer));
 		buffer[sizeof(buffer) - 1] = '\0';
 		freeaddrinfo(res);
 		return buffer;
 	}
 
-	strncpy (buffer, site, sizeof(buffer));
+	strncpy(buffer, site, sizeof(buffer));
 	return buffer;
 }