X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=484ec5ef64572c8c6c4f9789aacd429a2241ab2f;hp=cf941dc5b6e30d555de2afa0b56b4c0aa3b7c2f1;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68 diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c index cf941dc..484ec5e 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. @@ -119,7 +117,7 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult) char *dp; #endif /* not DUMB */ - if (err && err[0]) { + if (err[0]) { if (eresult) strcpy (eresult, err); else @@ -206,18 +204,18 @@ 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; + 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 = strcasecmp (LocalName(), mp->m_host) ? NETHOST : LOCALHOST; + mp->m_type = mh_strcasecmp (LocalName(), mp->m_host) ? NETHOST : LOCALHOST; } else { if (dp = strchr(mp->m_host, '.')) { @@ -456,11 +454,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 +479,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 +505,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: