From d2f12554a254e814dcdafb3828fc0d9936154eef Mon Sep 17 00:00:00 2001 From: Josh Bressers Date: Wed, 8 Mar 2006 12:14:15 +0000 Subject: [PATCH] * (mh_strcasecmp): Rename the private strcasecmp function to mh_strcasecmp. --- ChangeLog | 5 +++ h/prototypes.h | 2 +- mts/smtp/hosts.c | 6 +-- sbr/addrsbr.c | 18 ++++----- sbr/check_charset.c | 2 +- sbr/context_del.c | 2 +- sbr/context_find.c | 2 +- sbr/context_replace.c | 2 +- sbr/fmt_rfc2047.c | 2 +- sbr/ruserpass.c | 2 +- sbr/strcasecmp.c | 4 +- uip/ali.c | 4 +- uip/aliasbr.c | 2 +- uip/mhbuildsbr.c | 98 ++++++++++++++++++++++++------------------------- uip/mhlsbr.c | 40 ++++++++++---------- uip/mhmisc.c | 2 +- uip/mhoutsbr.c | 2 +- uip/mhparam.c | 2 +- uip/mhparse.c | 68 +++++++++++++++++----------------- uip/mhstoresbr.c | 22 +++++------ uip/msh.c | 2 +- uip/mshcmds.c | 24 ++++++------ uip/picksbr.c | 10 ++--- uip/popsbr.c | 6 +-- uip/post.c | 6 +-- uip/rcvdist.c | 2 +- uip/replsbr.c | 6 +-- uip/scansbr.c | 2 +- uip/sendsbr.c | 12 +++--- uip/show.c | 18 ++++----- uip/slocal.c | 24 ++++++------ uip/sortm.c | 4 +- uip/spost.c | 2 +- 33 files changed, 205 insertions(+), 200 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6ea906..f593db9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-08 Josh Bressers + + * (mh_strcasecmp): Rename the private strcasecmp function to + mh_strcasecmp. This keeps the newer gnu linker happy. + 2006-03-05 Oliver Kiddle * sbr/fmt_rfc2047.c: don't try to malloc 0 bytes if an RFC2047 diff --git a/h/prototypes.h b/h/prototypes.h index 1d1d456..7e772e0 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -137,7 +137,7 @@ int snprintf (char *, size_t, const char *, ...); int vsnprintf (char *, size_t, const char *, va_list); #endif -int strcasecmp (const char *s1, const char *s2); +int mh_strcasecmp (const char *s1, const char *s2); int strncasecmp (const char *s1, const char *s2, size_t n); diff --git a/mts/smtp/hosts.c b/mts/smtp/hosts.c index 263bcef..607f4ec 100644 --- a/mts/smtp/hosts.c +++ b/mts/smtp/hosts.c @@ -48,7 +48,7 @@ OfficialName (char *name) *q = '\0'; q = site; - if (!strcasecmp (LocalName(), site)) + if (!mh_strcasecmp (LocalName(), site)) return LocalName(); #ifdef HAVE_SETHOSTENT @@ -61,11 +61,11 @@ OfficialName (char *name) } if (hosts.h_name || init_hs ()) { for (h = hosts.h_next; h; h = h->h_next) - if (!strcasecmp (h->h_name, q)) { + if (!mh_strcasecmp (h->h_name, q)) { return h->h_name; } else { for (r = h->h_aliases; *r; r++) - if (!strcasecmp (*r, q)) + if (!mh_strcasecmp (*r, q)) return h->h_name; } } diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c index cf941dc..fa45e31 100644 --- a/sbr/addrsbr.c +++ b/sbr/addrsbr.c @@ -206,18 +206,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 +456,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 +481,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 +507,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: diff --git a/sbr/check_charset.c b/sbr/check_charset.c index d6b8ca3..9d0d625 100644 --- a/sbr/check_charset.c +++ b/sbr/check_charset.c @@ -53,7 +53,7 @@ check_charset (char *str, int len) /* US-ASCII is a subset of the ISO-8859-X and UTF-8 character sets */ if (!strncasecmp("ISO-8859-", mm_charset, 9) || - !strcasecmp("UTF-8", mm_charset)) { + !mh_strcasecmp("UTF-8", mm_charset)) { alt_charset = "US-ASCII"; alt_len = strlen (alt_charset); } diff --git a/sbr/context_del.c b/sbr/context_del.c index b38d822..859c851 100644 --- a/sbr/context_del.c +++ b/sbr/context_del.c @@ -22,7 +22,7 @@ context_del (char *key) register struct node *np, *pp; for (np = m_defs, pp = NULL; np; pp = np, np = np->n_next) { - if (!strcasecmp (np->n_name, key)) { + if (!mh_strcasecmp (np->n_name, key)) { if (!np->n_context) admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name); if (pp) diff --git a/sbr/context_find.c b/sbr/context_find.c index efac368..f96d0b3 100644 --- a/sbr/context_find.c +++ b/sbr/context_find.c @@ -18,7 +18,7 @@ context_find (char *str) struct node *np; for (np = m_defs; np; np = np->n_next) - if (!strcasecmp (np->n_name, str)) + if (!mh_strcasecmp (np->n_name, str)) return (np->n_field); return NULL; diff --git a/sbr/context_replace.c b/sbr/context_replace.c index 2cdadf0..4416eee 100644 --- a/sbr/context_replace.c +++ b/sbr/context_replace.c @@ -38,7 +38,7 @@ context_replace (char *key, char *value) * this key, and replace its value if found. */ for (np = m_defs;; np = np->n_next) { - if (!strcasecmp (np->n_name, key)) { + if (!mh_strcasecmp (np->n_name, key)) { if (strcmp (value, np->n_field)) { if (!np->n_context) admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value); diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c index 7013cea..ef1bdfa 100644 --- a/sbr/fmt_rfc2047.c +++ b/sbr/fmt_rfc2047.c @@ -135,7 +135,7 @@ decode_rfc2047 (char *str, char *dst, size_t dstlen) /* .. it can't. We'll use iconv then. */ *pp = '\0'; cd = iconv_open(get_charset(), startofmime); - fromutf8 = !strcasecmp(startofmime, "UTF-8"); + fromutf8 = !mh_strcasecmp(startofmime, "UTF-8"); *pp = '?'; if (cd == (iconv_t)-1) continue; use_iconv = 1; diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c index 3097ee7..36605be 100644 --- a/sbr/ruserpass.c +++ b/sbr/ruserpass.c @@ -92,7 +92,7 @@ ruserpass(char *host, char **aname, char **apass) /* * Allow match either for user's host name. */ - if (strcasecmp(host, tokval) == 0) + if (mh_strcasecmp(host, tokval) == 0) goto match; continue; } diff --git a/sbr/strcasecmp.c b/sbr/strcasecmp.c index f0358bd..4a026a3 100644 --- a/sbr/strcasecmp.c +++ b/sbr/strcasecmp.c @@ -18,7 +18,7 @@ */ int -strcasecmp (const char *s1, const char *s2) +mh_strcasecmp (const char *s1, const char *s2) { const unsigned char *us1, *us2; @@ -38,7 +38,7 @@ strcasecmp (const char *s1, const char *s2) int -strncasecmp (const char *s1, const char *s2, size_t n) +mh_strncasecmp (const char *s1, const char *s2, size_t n) { const unsigned char *us1, *us2; diff --git a/uip/ali.c b/uip/ali.c index 737f68c..bbc6f6d 100644 --- a/uip/ali.c +++ b/uip/ali.c @@ -233,8 +233,8 @@ print_usr (char *s, int list, int norm) while ((cp = getname (pp))) { if ((np = getm (cp, NULL, 0, norm, NULL)) == NULL) continue; - if (!strcasecmp (mp->m_host, np->m_host) - && !strcasecmp (mp->m_mbox, np->m_mbox)) { + if (!mh_strcasecmp (mp->m_host, np->m_host) + && !mh_strcasecmp (mp->m_mbox, np->m_mbox)) { vp = vp ? add (ak->ak_name, add (",", vp)) : getcpy (ak->ak_name); mnfree (np); diff --git a/uip/aliasbr.c b/uip/aliasbr.c index aadd676..af3827b 100644 --- a/uip/aliasbr.c +++ b/uip/aliasbr.c @@ -574,7 +574,7 @@ seek_home (char *name) #endif /* DBMPWD */ for (hp = homehead; hp; hp = hp->h_next) - if (!strcasecmp (name, hp->h_name)) + if (!mh_strcasecmp (name, hp->h_name)) return hp; #ifdef DBMPWD diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index c6f5098..4882ecb 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -300,15 +300,15 @@ build_mime (char *infile) compnum++; /* abort if draft has Mime-Version header field */ - if (!strcasecmp (name, VRSN_FIELD)) + if (!mh_strcasecmp (name, VRSN_FIELD)) adios (NULL, "draft shouldn't contain %s: field", VRSN_FIELD); /* abort if draft has Content-Transfer-Encoding header field */ - if (!strcasecmp (name, ENCODING_FIELD)) + if (!mh_strcasecmp (name, ENCODING_FIELD)) adios (NULL, "draft shouldn't contain %s: field", ENCODING_FIELD); /* ignore any Content-Type fields in the header */ - if (!strcasecmp (name, TYPE_FIELD)) { + if (!mh_strcasecmp (name, TYPE_FIELD)) { while (state == FLDPLUS) state = m_getfld (state, name, buf, sizeof(buf), in); goto finish_field; @@ -497,7 +497,7 @@ get_content (FILE *in, char *file, int toplevel) compnum++; /* Get MIME-Version field */ - if (!strcasecmp (name, VRSN_FIELD)) { + if (!mh_strcasecmp (name, VRSN_FIELD)) { int ucmp; char c, *cp, *dp; @@ -533,7 +533,7 @@ get_content (FILE *in, char *file, int toplevel) for (dp = cp; istoken (*dp); dp++) continue; c = *dp, *dp = '\0'; - ucmp = !strcasecmp (cp, VRSN_VALUE); + ucmp = !mh_strcasecmp (cp, VRSN_VALUE); *dp = c; if (!ucmp) admonish (NULL, @@ -543,7 +543,7 @@ get_content (FILE *in, char *file, int toplevel) } /* Get Content-Type field */ - if (!strcasecmp (name, TYPE_FIELD)) { + if (!mh_strcasecmp (name, TYPE_FIELD)) { char *cp; struct str2init *s2i; CI ci = &ct->c_ctinfo; @@ -574,7 +574,7 @@ get_content (FILE *in, char *file, int toplevel) * flag for this content type. */ for (s2i = str2cts; s2i->si_key; s2i++) - if (!strcasecmp (ci->ci_type, s2i->si_key)) + if (!mh_strcasecmp (ci->ci_type, s2i->si_key)) break; if (!s2i->si_key && !uprf (ci->ci_type, "X-")) s2i++; @@ -584,7 +584,7 @@ get_content (FILE *in, char *file, int toplevel) } /* Get Content-Transfer-Encoding field */ - if (!strcasecmp (name, ENCODING_FIELD)) { + if (!mh_strcasecmp (name, ENCODING_FIELD)) { char *cp, *dp; char c; struct str2init *s2i; @@ -620,7 +620,7 @@ get_content (FILE *in, char *file, int toplevel) * for this transfer encoding. */ for (s2i = str2ces; s2i->si_key; s2i++) - if (!strcasecmp (cp, s2i->si_key)) + if (!mh_strcasecmp (cp, s2i->si_key)) break; if (!s2i->si_key && !uprf (cp, "X-")) s2i++; @@ -634,7 +634,7 @@ get_content (FILE *in, char *file, int toplevel) } /* Get Content-ID field */ - if (!strcasecmp (name, ID_FIELD)) { + if (!mh_strcasecmp (name, ID_FIELD)) { ct->c_id = add (buf, ct->c_id); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof(buf), in); @@ -644,7 +644,7 @@ get_content (FILE *in, char *file, int toplevel) } /* Get Content-Description field */ - if (!strcasecmp (name, DESCR_FIELD)) { + if (!mh_strcasecmp (name, DESCR_FIELD)) { ct->c_descr = add (buf, ct->c_descr); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof(buf), in); @@ -654,7 +654,7 @@ get_content (FILE *in, char *file, int toplevel) } /* Get Content-Disposition field */ - if (!strcasecmp (name, DISPO_FIELD)) { + if (!mh_strcasecmp (name, DISPO_FIELD)) { ct->c_dispo = add (buf, ct->c_dispo); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof(buf), in); @@ -664,7 +664,7 @@ get_content (FILE *in, char *file, int toplevel) } /* Get Content-MD5 field */ - if (!strcasecmp (name, MD5_FIELD)) { + if (!mh_strcasecmp (name, MD5_FIELD)) { char *cp, *dp, *ep; cp = add (buf, NULL); @@ -1220,7 +1220,7 @@ InitText (CT ct) /* match subtype */ for (kv = SubText; kv->kv_key; kv++) - if (!strcasecmp (ci->ci_subtype, kv->kv_key)) + if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key)) break; ct->c_subtype = kv->kv_value; @@ -1234,14 +1234,14 @@ InitText (CT ct) /* scan for charset parameter */ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) - if (!strcasecmp (*ap, "charset")) + if (!mh_strcasecmp (*ap, "charset")) break; /* check if content specified a character set */ if (*ap) { /* match character set or set to CHARSET_UNKNOWN */ for (kv = Charset; kv->kv_key; kv++) - if (!strcasecmp (*ep, kv->kv_key)) + if (!mh_strcasecmp (*ep, kv->kv_key)) break; t->tx_charset = kv->kv_value; } @@ -1282,7 +1282,7 @@ InitMultiPart (CT ct) /* match subtype */ for (kv = SubMultiPart; kv->kv_key; kv++) - if (!strcasecmp (ci->ci_subtype, kv->kv_key)) + if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key)) break; ct->c_subtype = kv->kv_value; @@ -1291,7 +1291,7 @@ InitMultiPart (CT ct) * required for multipart messages. */ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!strcasecmp (*ap, "boundary")) { + if (!mh_strcasecmp (*ap, "boundary")) { bp = *ep; break; } @@ -1512,7 +1512,7 @@ InitMessage (CT ct) /* match subtype */ for (kv = SubMessage; kv->kv_key; kv++) - if (!strcasecmp (ci->ci_subtype, kv->kv_key)) + if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key)) break; ct->c_subtype = kv->kv_value; @@ -1531,11 +1531,11 @@ InitMessage (CT ct) /* scan for parameters "id", "number", and "total" */ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!strcasecmp (*ap, "id")) { + if (!mh_strcasecmp (*ap, "id")) { p->pm_partid = add (*ep, NULL); continue; } - if (!strcasecmp (*ap, "number")) { + if (!mh_strcasecmp (*ap, "number")) { if (sscanf (*ep, "%d", &p->pm_partno) != 1 || p->pm_partno < 1) { invalid_param: @@ -1547,7 +1547,7 @@ invalid_param: } continue; } - if (!strcasecmp (*ap, "total")) { + if (!mh_strcasecmp (*ap, "total")) { if (sscanf (*ep, "%d", &p->pm_maxno) != 1 || p->pm_maxno < 1) goto invalid_param; @@ -1668,12 +1668,12 @@ params_external (CT ct, int composing) CI ci = &ct->c_ctinfo; for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!strcasecmp (*ap, "access-type")) { + if (!mh_strcasecmp (*ap, "access-type")) { struct str2init *s2i; CT p = e->eb_content; for (s2i = str2methods; s2i->si_key; s2i++) - if (!strcasecmp (*ep, s2i->si_key)) + if (!mh_strcasecmp (*ep, s2i->si_key)) break; if (!s2i->si_key) { @@ -1691,39 +1691,39 @@ params_external (CT ct, int composing) return NOTOK; continue; } - if (!strcasecmp (*ap, "name")) { + if (!mh_strcasecmp (*ap, "name")) { e->eb_name = *ep; continue; } - if (!strcasecmp (*ap, "permission")) { + if (!mh_strcasecmp (*ap, "permission")) { e->eb_permission = *ep; continue; } - if (!strcasecmp (*ap, "site")) { + if (!mh_strcasecmp (*ap, "site")) { e->eb_site = *ep; continue; } - if (!strcasecmp (*ap, "directory")) { + if (!mh_strcasecmp (*ap, "directory")) { e->eb_dir = *ep; continue; } - if (!strcasecmp (*ap, "mode")) { + if (!mh_strcasecmp (*ap, "mode")) { e->eb_mode = *ep; continue; } - if (!strcasecmp (*ap, "size")) { + if (!mh_strcasecmp (*ap, "size")) { sscanf (*ep, "%lu", &e->eb_size); continue; } - if (!strcasecmp (*ap, "server")) { + if (!mh_strcasecmp (*ap, "server")) { e->eb_server = *ep; continue; } - if (!strcasecmp (*ap, "subject")) { + if (!mh_strcasecmp (*ap, "subject")) { e->eb_subject = *ep; continue; } - if (composing && !strcasecmp (*ap, "body")) { + if (composing && !mh_strcasecmp (*ap, "body")) { e->eb_body = getcpy (*ep); continue; } @@ -1752,7 +1752,7 @@ InitApplication (CT ct) /* match subtype */ for (kv = SubApplication; kv->kv_key; kv++) - if (!strcasecmp (ci->ci_subtype, kv->kv_key)) + if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key)) break; ct->c_subtype = kv->kv_value; @@ -2503,7 +2503,7 @@ openFile (CT ct, char **file) return NOTOK; } - if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write")) + if ((!e->eb_permission || mh_strcasecmp (e->eb_permission, "read-write")) && find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id, cachefile, sizeof(cachefile)) != NOTOK) { int mask; @@ -2651,7 +2651,7 @@ openFTP (CT ct, char **file) ce->ce_unlink = (*file == NULL); caching = 0; cachefile[0] = '\0'; - if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write")) + if ((!e->eb_permission || mh_strcasecmp (e->eb_permission, "read-write")) && find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id, cachefile, sizeof(cachefile)) != NOTOK) { if (*file == NULL) { @@ -2687,7 +2687,7 @@ openFTP (CT ct, char **file) vec[vecp++] = e->eb_dir; vec[vecp++] = e->eb_name; vec[vecp++] = ce->ce_file, - vec[vecp++] = e->eb_mode && !strcasecmp (e->eb_mode, "ascii") + vec[vecp++] = e->eb_mode && !mh_strcasecmp (e->eb_mode, "ascii") ? "ascii" : "binary"; vec[vecp] = NULL; @@ -2724,7 +2724,7 @@ losing_ftp: else if (ftp_get (e->eb_site, user, pass, e->eb_dir, e->eb_name, ce->ce_file, - e->eb_mode && !strcasecmp (e->eb_mode, "ascii"), 0) + e->eb_mode && !mh_strcasecmp (e->eb_mode, "ascii"), 0) == NOTOK) goto losing_ftp; #endif @@ -3056,7 +3056,7 @@ rock_and_roll: done (1); for (s2i = str2cts; s2i->si_key; s2i++) - if (!strcasecmp (ci->ci_type, s2i->si_key)) + if (!mh_strcasecmp (ci->ci_type, s2i->si_key)) break; if (!s2i->si_key && !uprf (ci->ci_type, "X-")) s2i++; @@ -3066,7 +3066,7 @@ rock_and_roll: */ switch (ct->c_type = s2i->si_val) { case CT_MESSAGE: - if (!strcasecmp (ci->ci_subtype, "rfc822")) { + if (!mh_strcasecmp (ci->ci_subtype, "rfc822")) { ct->c_encoding = CE_7BIT; goto call_init; } @@ -3102,7 +3102,7 @@ call_init: /* check directive against the list of MIME types */ for (s2i = str2cts; s2i->si_key; s2i++) - if (!strcasecmp (ci->ci_type, s2i->si_key)) + if (!mh_strcasecmp (ci->ci_type, s2i->si_key)) break; /* @@ -3123,10 +3123,10 @@ call_init: /* NOTREACHED */ case CT_MESSAGE: - if (!strcasecmp (ci->ci_subtype, "partial")) + if (!mh_strcasecmp (ci->ci_subtype, "partial")) adios (NULL, "sorry, \"#%s/%s\" isn't supported", ci->ci_type, ci->ci_subtype); - if (!strcasecmp (ci->ci_subtype, "external-body")) + if (!mh_strcasecmp (ci->ci_subtype, "external-body")) adios (NULL, "use \"#@type/subtype ... [] ...\" instead of \"#%s/%s\"", ci->ci_type, ci->ci_subtype); use_forw: @@ -3233,7 +3233,7 @@ use_forw: * Message directive * #forw [+folder] [msgs] */ - if (!strcasecmp (ci->ci_type, "forw")) { + if (!mh_strcasecmp (ci->ci_type, "forw")) { int msgnum; char *folder, *arguments[MAXARGS]; struct msgs *mp; @@ -3339,7 +3339,7 @@ use_forw: /* * #end */ - if (!strcasecmp (ci->ci_type, "end")) { + if (!mh_strcasecmp (ci->ci_type, "end")) { free_content (ct); *ctp = NULL; return DONE; @@ -3348,14 +3348,14 @@ use_forw: /* * #begin [ alternative | parallel ] */ - if (!strcasecmp (ci->ci_type, "begin")) { + if (!mh_strcasecmp (ci->ci_type, "begin")) { if (!ci->ci_magic) { vrsn = MULTI_MIXED; cp = SubMultiPart[vrsn - 1].kv_key; - } else if (!strcasecmp (ci->ci_magic, "alternative")) { + } else if (!mh_strcasecmp (ci->ci_magic, "alternative")) { vrsn = MULTI_ALTERNATE; cp = SubMultiPart[vrsn - 1].kv_key; - } else if (!strcasecmp (ci->ci_magic, "parallel")) { + } else if (!mh_strcasecmp (ci->ci_magic, "parallel")) { vrsn = MULTI_PARALLEL; cp = SubMultiPart[vrsn - 1].kv_key; } else if (uprf (ci->ci_magic, "digest")) { @@ -3973,7 +3973,7 @@ build_headers (CT ct) * the end of the Content-Type line. */ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (mailbody && !strcasecmp (*ap, "body")) + if (mailbody && !mh_strcasecmp (*ap, "body")) continue; vp = add (";", vp); diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 31c24bb..04da52b 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -563,7 +563,7 @@ mhl_format (char *file, int length, int width) * Split this list of fields to ignore, and copy * it to the end of the current "ignores" list. */ - if (!strcasecmp (name, "ignores")) { + if (!mh_strcasecmp (name, "ignores")) { char **tmparray, **p; int n = 0; @@ -667,17 +667,17 @@ evalvar (struct mcomp *c1) return 0; strncpy (name, parse(), sizeof(name)); - if (!strcasecmp (name, "component")) { + if (!mh_strcasecmp (name, "component")) { if (ptos (name, &c1->c_text)) return 1; c1->c_flags &= ~NOCOMPONENT; return 0; } - if (!strcasecmp (name, "overflowtext")) + if (!mh_strcasecmp (name, "overflowtext")) return ptos (name, &c1->c_ovtxt); - if (!strcasecmp (name, "formatfield")) { + if (!mh_strcasecmp (name, "formatfield")) { char *nfs; if (ptos (name, &cp)) @@ -688,7 +688,7 @@ evalvar (struct mcomp *c1) return 0; } - if (!strcasecmp (name, "decode")) { + if (!mh_strcasecmp (name, "decode")) { char *nfs; nfs = new_fs (NULL, NULL, "%(decode{text})"); @@ -697,21 +697,21 @@ evalvar (struct mcomp *c1) return 0; } - if (!strcasecmp (name, "offset")) + if (!mh_strcasecmp (name, "offset")) return ptoi (name, &c1->c_offset); - if (!strcasecmp (name, "overflowoffset")) + if (!mh_strcasecmp (name, "overflowoffset")) return ptoi (name, &c1->c_ovoff); - if (!strcasecmp (name, "width")) + if (!mh_strcasecmp (name, "width")) return ptoi (name, &c1->c_width); - if (!strcasecmp (name, "compwidth")) + if (!mh_strcasecmp (name, "compwidth")) return ptoi (name, &c1->c_cwidth); - if (!strcasecmp (name, "length")) + if (!mh_strcasecmp (name, "length")) return ptoi (name, &c1->c_length); - if (!strcasecmp (name, "nodashstuffing")) + if (!mh_strcasecmp (name, "nodashstuffing")) return (dashstuff = -1); for (ap = triples; ap->t_name; ap++) - if (!strcasecmp (ap->t_name, name)) { + if (!mh_strcasecmp (ap->t_name, name)) { c1->c_flags |= ap->t_on; c1->c_flags &= ~ap->t_off; return 0; @@ -904,7 +904,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) case FLD: case FLDPLUS: for (ip = ignores; *ip; ip++) - if (!strcasecmp (name, *ip)) { + if (!mh_strcasecmp (name, *ip)) { while (state == FLDPLUS) state = m_getfld (state, name, buf, sizeof(buf), fp); break; @@ -913,12 +913,12 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) continue; for (c2 = fmthd; c2; c2 = c2->c_next) - if (!strcasecmp (c2->c_name, name)) + if (!mh_strcasecmp (c2->c_name, name)) break; c1 = NULL; if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT)) for (c1 = msghd; c1; c1 = c1->c_next) - if (!strcasecmp (c1->c_name, c3->c_name)) { + if (!mh_strcasecmp (c1->c_name, c3->c_name)) { c1->c_text = mcomp_add (c1->c_flags, buf, c1->c_text); break; @@ -941,7 +941,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) putcomp (c1, c1, ONECOMP); continue; } - if (!strcasecmp (c1->c_name, "messagename")) { + if (!mh_strcasecmp (c1->c_name, "messagename")) { holder.c_text = concat ("(Message ", mname, ")\n", NULL); putcomp (c1, &holder, ONECOMP); @@ -949,13 +949,13 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) holder.c_text = NULL; continue; } - if (!strcasecmp (c1->c_name, "extras")) { + if (!mh_strcasecmp (c1->c_name, "extras")) { for (c2 = msghd; c2; c2 = c2->c_next) if (c2->c_flags & EXTRA) putcomp (c1, c2, TWOCOMP); continue; } - if (dobody && !strcasecmp (c1->c_name, "body")) { + if (dobody && !mh_strcasecmp (c1->c_name, "body")) { holder.c_text = mh_xmalloc (sizeof(buf)); strncpy (holder.c_text, buf, sizeof(buf)); while (state == BODY) { @@ -968,7 +968,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) continue; } for (c2 = msghd; c2; c2 = c2->c_next) - if (!strcasecmp (c2->c_name, c1->c_name)) { + if (!mh_strcasecmp (c2->c_name, c1->c_name)) { putcomp (c1, c2, ONECOMP); if (!(c1->c_flags & SPLIT)) break; @@ -1006,7 +1006,7 @@ mcomp_flags (char *name) struct pair *ap; for (ap = pairs; ap->p_name; ap++) - if (!strcasecmp (ap->p_name, name)) + if (!mh_strcasecmp (ap->p_name, name)) return (ap->p_flags); return 0; diff --git a/uip/mhmisc.c b/uip/mhmisc.c index 9f0044a..fddd552 100644 --- a/uip/mhmisc.c +++ b/uip/mhmisc.c @@ -74,7 +74,7 @@ type_ok (CT ct, int sP) snprintf (buffer, sizeof(buffer), "%s/%s", ci->ci_type, ci->ci_subtype); for (ap = types; *ap; ap++) - if (!strcasecmp (*ap, ci->ci_type) || !strcasecmp (*ap, buffer)) + if (!mh_strcasecmp (*ap, ci->ci_type) || !mh_strcasecmp (*ap, buffer)) return 1; return 0; diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c index fff4ccc..2ebdc1f 100644 --- a/uip/mhoutsbr.c +++ b/uip/mhoutsbr.c @@ -263,7 +263,7 @@ writeExternalBody (CT ct, FILE *out) case 'N': for (ap = ci2->ci_attrs, ep = ci2->ci_values; *ap; ap++, ep++) - if (!strcasecmp (*ap, "name")) { + if (!mh_strcasecmp (*ap, "name")) { fprintf (out, "%s", *ep); break; } diff --git a/uip/mhparam.c b/uip/mhparam.c index 5e5e006..0b60b03 100644 --- a/uip/mhparam.c +++ b/uip/mhparam.c @@ -191,7 +191,7 @@ p_find(char *str) struct proc *ps; for (ps = procs; ps->p_name; ps++) - if (!strcasecmp (ps->p_name, str)) + if (!mh_strcasecmp (ps->p_name, str)) return (*ps->p_field); return NULL; diff --git a/uip/mhparse.c b/uip/mhparse.c index fc24f5e..8d3397e 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -375,7 +375,7 @@ get_content (FILE *in, char *file, int toplevel) hp = ct->c_first_hf; /* start at first header field */ while (hp) { /* Get MIME-Version field */ - if (!strcasecmp (hp->name, VRSN_FIELD)) { + if (!mh_strcasecmp (hp->name, VRSN_FIELD)) { int ucmp; char c, *cp, *dp; @@ -407,14 +407,14 @@ get_content (FILE *in, char *file, int toplevel) continue; c = *dp; *dp = '\0'; - ucmp = !strcasecmp (cp, VRSN_VALUE); + ucmp = !mh_strcasecmp (cp, VRSN_VALUE); *dp = c; if (!ucmp) { admonish (NULL, "message %s has unknown value for %s: field (%s)", ct->c_file, VRSN_FIELD, cp); } } - else if (!strcasecmp (hp->name, TYPE_FIELD)) { + else if (!mh_strcasecmp (hp->name, TYPE_FIELD)) { /* Get Content-Type field */ struct str2init *s2i; CI ci = &ct->c_ctinfo; @@ -435,14 +435,14 @@ get_content (FILE *in, char *file, int toplevel) * flag for this content type. */ for (s2i = str2cts; s2i->si_key; s2i++) - if (!strcasecmp (ci->ci_type, s2i->si_key)) + if (!mh_strcasecmp (ci->ci_type, s2i->si_key)) break; if (!s2i->si_key && !uprf (ci->ci_type, "X-")) s2i++; ct->c_type = s2i->si_val; ct->c_ctinitfnx = s2i->si_init; } - else if (!strcasecmp (hp->name, ENCODING_FIELD)) { + else if (!mh_strcasecmp (hp->name, ENCODING_FIELD)) { /* Get Content-Transfer-Encoding field */ char c, *cp, *dp; struct str2init *s2i; @@ -472,7 +472,7 @@ get_content (FILE *in, char *file, int toplevel) * for this transfer encoding. */ for (s2i = str2ces; s2i->si_key; s2i++) - if (!strcasecmp (cp, s2i->si_key)) + if (!mh_strcasecmp (cp, s2i->si_key)) break; if (!s2i->si_key && !uprf (cp, "X-")) s2i++; @@ -483,7 +483,7 @@ get_content (FILE *in, char *file, int toplevel) if (s2i->si_init && (*s2i->si_init) (ct) == NOTOK) goto out; } - else if (!strcasecmp (hp->name, MD5_FIELD)) { + else if (!mh_strcasecmp (hp->name, MD5_FIELD)) { /* Get Content-MD5 field */ char *cp, *dp, *ep; @@ -522,11 +522,11 @@ get_content (FILE *in, char *file, int toplevel) free (ep); ct->c_digested++; } - else if (!strcasecmp (hp->name, ID_FIELD)) { + else if (!mh_strcasecmp (hp->name, ID_FIELD)) { /* Get Content-ID field */ ct->c_id = add (hp->value, ct->c_id); } - else if (!strcasecmp (hp->name, DESCR_FIELD)) { + else if (!mh_strcasecmp (hp->name, DESCR_FIELD)) { /* Get Content-Description field */ ct->c_descr = add (hp->value, ct->c_descr); } @@ -907,7 +907,7 @@ InitText (CT ct) /* match subtype */ for (kv = SubText; kv->kv_key; kv++) - if (!strcasecmp (ci->ci_subtype, kv->kv_key)) + if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key)) break; ct->c_subtype = kv->kv_value; @@ -918,7 +918,7 @@ InitText (CT ct) /* scan for charset parameter */ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) - if (!strcasecmp (*ap, "charset")) + if (!mh_strcasecmp (*ap, "charset")) break; if (*ap) @@ -928,7 +928,7 @@ InitText (CT ct) /* match character set, or set to unknown */ for (kv = Charset; kv->kv_key; kv++) - if (!strcasecmp (chset, kv->kv_key)) + if (!mh_strcasecmp (chset, kv->kv_key)) break; t->tx_charset = kv->kv_value; @@ -979,7 +979,7 @@ InitMultiPart (CT ct) /* match subtype */ for (kv = SubMultiPart; kv->kv_key; kv++) - if (!strcasecmp (ci->ci_subtype, kv->kv_key)) + if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key)) break; ct->c_subtype = kv->kv_value; @@ -989,7 +989,7 @@ InitMultiPart (CT ct) */ bp = 0; for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!strcasecmp (*ap, "boundary")) { + if (!mh_strcasecmp (*ap, "boundary")) { bp = *ep; break; } @@ -1209,7 +1209,7 @@ InitMessage (CT ct) /* match subtype */ for (kv = SubMessage; kv->kv_key; kv++) - if (!strcasecmp (ci->ci_subtype, kv->kv_key)) + if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key)) break; ct->c_subtype = kv->kv_value; @@ -1228,11 +1228,11 @@ InitMessage (CT ct) /* scan for parameters "id", "number", and "total" */ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!strcasecmp (*ap, "id")) { + if (!mh_strcasecmp (*ap, "id")) { p->pm_partid = add (*ep, NULL); continue; } - if (!strcasecmp (*ap, "number")) { + if (!mh_strcasecmp (*ap, "number")) { if (sscanf (*ep, "%d", &p->pm_partno) != 1 || p->pm_partno < 1) { invalid_param: @@ -1244,7 +1244,7 @@ invalid_param: } continue; } - if (!strcasecmp (*ap, "total")) { + if (!mh_strcasecmp (*ap, "total")) { if (sscanf (*ep, "%d", &p->pm_maxno) != 1 || p->pm_maxno < 1) goto invalid_param; @@ -1364,12 +1364,12 @@ params_external (CT ct, int composing) CI ci = &ct->c_ctinfo; for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!strcasecmp (*ap, "access-type")) { + if (!mh_strcasecmp (*ap, "access-type")) { struct str2init *s2i; CT p = e->eb_content; for (s2i = str2methods; s2i->si_key; s2i++) - if (!strcasecmp (*ep, s2i->si_key)) + if (!mh_strcasecmp (*ep, s2i->si_key)) break; if (!s2i->si_key) { e->eb_access = *ep; @@ -1386,39 +1386,39 @@ params_external (CT ct, int composing) return NOTOK; continue; } - if (!strcasecmp (*ap, "name")) { + if (!mh_strcasecmp (*ap, "name")) { e->eb_name = *ep; continue; } - if (!strcasecmp (*ap, "permission")) { + if (!mh_strcasecmp (*ap, "permission")) { e->eb_permission = *ep; continue; } - if (!strcasecmp (*ap, "site")) { + if (!mh_strcasecmp (*ap, "site")) { e->eb_site = *ep; continue; } - if (!strcasecmp (*ap, "directory")) { + if (!mh_strcasecmp (*ap, "directory")) { e->eb_dir = *ep; continue; } - if (!strcasecmp (*ap, "mode")) { + if (!mh_strcasecmp (*ap, "mode")) { e->eb_mode = *ep; continue; } - if (!strcasecmp (*ap, "size")) { + if (!mh_strcasecmp (*ap, "size")) { sscanf (*ep, "%lu", &e->eb_size); continue; } - if (!strcasecmp (*ap, "server")) { + if (!mh_strcasecmp (*ap, "server")) { e->eb_server = *ep; continue; } - if (!strcasecmp (*ap, "subject")) { + if (!mh_strcasecmp (*ap, "subject")) { e->eb_subject = *ep; continue; } - if (composing && !strcasecmp (*ap, "body")) { + if (composing && !mh_strcasecmp (*ap, "body")) { e->eb_body = getcpy (*ep); continue; } @@ -1447,7 +1447,7 @@ InitApplication (CT ct) /* match subtype */ for (kv = SubApplication; kv->kv_key; kv++) - if (!strcasecmp (ci->ci_subtype, kv->kv_key)) + if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key)) break; ct->c_subtype = kv->kv_value; @@ -2225,7 +2225,7 @@ openFile (CT ct, char **file) return NOTOK; } - if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write")) + if ((!e->eb_permission || mh_strcasecmp (e->eb_permission, "read-write")) && find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id, cachefile, sizeof(cachefile)) != NOTOK) { int mask; @@ -2373,7 +2373,7 @@ openFTP (CT ct, char **file) ce->ce_unlink = (*file == NULL); caching = 0; cachefile[0] = '\0'; - if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write")) + if ((!e->eb_permission || mh_strcasecmp (e->eb_permission, "read-write")) && find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id, cachefile, sizeof(cachefile)) != NOTOK) { if (*file == NULL) { @@ -2409,7 +2409,7 @@ openFTP (CT ct, char **file) vec[vecp++] = e->eb_dir; vec[vecp++] = e->eb_name; vec[vecp++] = ce->ce_file, - vec[vecp++] = e->eb_mode && !strcasecmp (e->eb_mode, "ascii") + vec[vecp++] = e->eb_mode && !mh_strcasecmp (e->eb_mode, "ascii") ? "ascii" : "binary"; vec[vecp] = NULL; @@ -2446,7 +2446,7 @@ losing_ftp: else if (ftp_get (e->eb_site, user, pass, e->eb_dir, e->eb_name, ce->ce_file, - e->eb_mode && !strcasecmp (e->eb_mode, "ascii"), 0) + e->eb_mode && !mh_strcasecmp (e->eb_mode, "ascii"), 0) == NOTOK) goto losing_ftp; #endif diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index 5776ef3..bf5088e 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -225,8 +225,8 @@ store_application (CT ct) for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { /* check for "type=tar" attribute */ - if (!strcasecmp (*ap, "type")) { - if (strcasecmp (*ep, "tar")) + if (!mh_strcasecmp (*ap, "type")) { + if (mh_strcasecmp (*ep, "tar")) break; tarP = 1; @@ -234,14 +234,14 @@ store_application (CT ct) } /* check for "conversions=compress" attribute */ - if ((!strcasecmp (*ap, "conversions") || !strcasecmp (*ap, "x-conversions")) - && (!strcasecmp (*ep, "compress") || !strcasecmp (*ep, "x-compress"))) { + if ((!mh_strcasecmp (*ap, "conversions") || !mh_strcasecmp (*ap, "x-conversions")) + && (!mh_strcasecmp (*ep, "compress") || !mh_strcasecmp (*ep, "x-compress"))) { zP = 1; continue; } /* check for "conversions=gzip" attribute */ - if ((!strcasecmp (*ap, "conversions") || !strcasecmp (*ap, "x-conversions")) - && (!strcasecmp (*ep, "gzip") || !strcasecmp (*ep, "x-gzip"))) { + if ((!mh_strcasecmp (*ap, "conversions") || !mh_strcasecmp (*ap, "x-conversions")) + && (!mh_strcasecmp (*ep, "gzip") || !mh_strcasecmp (*ep, "x-gzip"))) { gzP = 1; continue; } @@ -1041,7 +1041,7 @@ get_storeproc (CT ct) * the storeproc. */ for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!strcasecmp (*ap, "name") + if (!mh_strcasecmp (*ap, "name") && *(cp = *ep) != '/' && *cp != '.' && *cp != '|' @@ -1072,10 +1072,10 @@ copy_some_headers (FILE *out, CT ct) * messages are not copied. */ if (!uprf (hp->name, XXX_FIELD_PRF) - && strcasecmp (hp->name, VRSN_FIELD) - && strcasecmp (hp->name, "Subject") - && strcasecmp (hp->name, "Encrypted") - && strcasecmp (hp->name, "Message-ID")) + && mh_strcasecmp (hp->name, VRSN_FIELD) + && mh_strcasecmp (hp->name, "Subject") + && mh_strcasecmp (hp->name, "Encrypted") + && mh_strcasecmp (hp->name, "Message-ID")) fprintf (out, "%s:%s", hp->name, hp->value); hp = hp->next; /* next header field */ } diff --git a/uip/msh.c b/uip/msh.c index df64de5..257fc42 100644 --- a/uip/msh.c +++ b/uip/msh.c @@ -1225,7 +1225,7 @@ readid (int msgnum) case FLD: case FLDEOF: case FLDPLUS: - if (!strcasecmp (name, BBoard_ID)) { + if (!mh_strcasecmp (name, BBoard_ID)) { bp = getcpy (buf); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof(buf), zp); diff --git a/uip/mshcmds.c b/uip/mshcmds.c index 63ee99c..f2c913c 100644 --- a/uip/mshcmds.c +++ b/uip/mshcmds.c @@ -2310,10 +2310,10 @@ showcmd (char **args) char *cp, *proc = showproc, buf[BUFSIZ]; char *msgs[MAXARGS], *vec[MAXARGS]; - if (!strcasecmp (cmd_name, "next")) + if (!mh_strcasecmp (cmd_name, "next")) mode = 1; else - if (!strcasecmp (cmd_name, "prev")) + if (!mh_strcasecmp (cmd_name, "prev")) mode = -1; while ((cp = *args++)) { if (*cp == '-') @@ -2565,7 +2565,7 @@ is_nontext (int msgnum) /* * Check Content-Type field */ - if (!strcasecmp (name, TYPE_FIELD)) { + if (!mh_strcasecmp (name, TYPE_FIELD)) { int passno; char c; @@ -2620,7 +2620,7 @@ invalid: if (!*bp) goto invalid; if (passno > 1) { - if ((result = (strcasecmp (bp, "plain") != 0))) + if ((result = (mh_strcasecmp (bp, "plain") != 0))) goto out; *dp = c; for (dp++; isspace (*dp); dp++) @@ -2652,7 +2652,7 @@ invalid: /* Check the character set */ result = !check_charset (dp, strlen (dp)); } else { - if (!(result = (strcasecmp (bp, "text") != 0))) { + if (!(result = (mh_strcasecmp (bp, "text") != 0))) { *dp = c; bp = dp; passno = 2; @@ -2671,7 +2671,7 @@ out: /* * Check Content-Transfer-Encoding field */ - if (!strcasecmp (name, ENCODING_FIELD)) { + if (!mh_strcasecmp (name, ENCODING_FIELD)) { cp = add (buf, NULL); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof buf, fp); @@ -2682,9 +2682,9 @@ out: for (dp = bp; istoken (*dp); dp++) continue; *dp = '\0'; - result = (strcasecmp (bp, "7bit") - && strcasecmp (bp, "8bit") - && strcasecmp (bp, "binary")); + result = (mh_strcasecmp (bp, "7bit") + && mh_strcasecmp (bp, "8bit") + && mh_strcasecmp (bp, "binary")); free (cp); if (result) { @@ -2868,7 +2868,7 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp) case FLD: case FLDEOF: case FLDPLUS: - if (!strcasecmp (name, datesw)) { + if (!mh_strcasecmp (name, datesw)) { bp = getcpy (buf); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof buf, zp); @@ -2885,7 +2885,7 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp) break; /* all done! */ gotdate++; } - else if (subjsw && !strcasecmp(name, subjsw)) { + else if (subjsw && !mh_strcasecmp(name, subjsw)) { bp = getcpy (buf); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof buf, zp); @@ -2965,7 +2965,7 @@ sosmash (char *subj, char *s) if (s) { cp = s; dp = s; /* dst pointer */ - if (!strcasecmp (subj, "subject")) + if (!mh_strcasecmp (subj, "subject")) while ((c = *cp)) { if (! isspace(c)) { if(uprf(cp, "re:")) diff --git a/uip/picksbr.c b/uip/picksbr.c index 1154f46..a7276d7 100644 --- a/uip/picksbr.c +++ b/uip/picksbr.c @@ -869,19 +869,19 @@ tws_special (char *ap) register struct tws *tw; time (&clock); - if (!strcasecmp (ap, "today")) + if (!mh_strcasecmp (ap, "today")) return dlocaltime (&clock); - if (!strcasecmp (ap, "yesterday")) { + if (!mh_strcasecmp (ap, "yesterday")) { clock -= (long) (60 * 60 * 24); return dlocaltime (&clock); } - if (!strcasecmp (ap, "tomorrow")) { + if (!mh_strcasecmp (ap, "tomorrow")) { clock += (long) (60 * 60 * 24); return dlocaltime (&clock); } for (i = 0; tw_ldotw[i]; i++) - if (!strcasecmp (ap, tw_ldotw[i])) + if (!mh_strcasecmp (ap, tw_ldotw[i])) break; if (tw_ldotw[i]) { if ((tw = dlocaltime (&clock)) == NULL) @@ -922,7 +922,7 @@ plist state = m_getfld (state, name, buf, sizeof buf, fp); bp = add (buf, bp); } - if (!strcasecmp (name, n->n_datef)) + if (!mh_strcasecmp (name, n->n_datef)) break; if (state != FLDEOF) continue; diff --git a/uip/popsbr.c b/uip/popsbr.c index 9d5f312..363f925 100644 --- a/uip/popsbr.c +++ b/uip/popsbr.c @@ -928,20 +928,20 @@ pop_xtnd (int (*action)(), char *fmt, ...) snprintf (buffer, sizeof(buffer), fmt, a, b, c, d); ap = brkstring (buffer, " ", "\n"); /* a hack, i know... */ - if (!strcasecmp(ap[0], "x-bboards")) { /* XTND "X-BBOARDS group */ + if (!mh_strcasecmp(ap[0], "x-bboards")) { /* XTND "X-BBOARDS group */ /* most of these parameters are meaningless under NNTP. * bbc.c was modified to set AKA and LEADERS as appropriate, * the rest are left blank. */ return OK; } - if (!strcasecmp (ap[0], "archive") && ap[1]) { + if (!mh_strcasecmp (ap[0], "archive") && ap[1]) { snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */ xtnd_last = 0; xtnd_first = 1; /* setup to fail in pop_stat */ return OK; } - if (!strcasecmp (ap[0], "bboards")) { + if (!mh_strcasecmp (ap[0], "bboards")) { if (ap[1]) { /* XTND "BBOARDS group" */ snprintf (xtnd_name, sizeof(xtnd_name), "%s", ap[1]); /* save the name */ diff --git a/uip/post.c b/uip/post.c index f880152..96120c1 100644 --- a/uip/post.c +++ b/uip/post.c @@ -946,7 +946,7 @@ get_header (char *header, struct headers *table) struct headers *h; for (h = table; h->value; h++) - if (!strcasecmp (header, h->value)) + if (!mh_strcasecmp (header, h->value)) return (h - table); return NOTOK; @@ -1048,8 +1048,8 @@ insert (struct mailname *np) : &netaddrs; mp->m_next; mp = mp->m_next) - if (!strcasecmp (np->m_host, mp->m_next->m_host) - && !strcasecmp (np->m_mbox, mp->m_next->m_mbox) + if (!mh_strcasecmp (np->m_host, mp->m_next->m_host) + && !mh_strcasecmp (np->m_mbox, mp->m_next->m_mbox) && np->m_bcc == mp->m_next->m_bcc) return 0; diff --git a/uip/rcvdist.c b/uip/rcvdist.c index c4be1b2..e881565 100644 --- a/uip/rcvdist.c +++ b/uip/rcvdist.c @@ -202,7 +202,7 @@ rcvdistout (FILE *inb, char *form, char *addrs) case FLDPLUS: if ((cptr = wantcomp[CHASH (name)])) do { - if (!strcasecmp (name, cptr->c_name)) { + if (!mh_strcasecmp (name, cptr->c_name)) { char_read += msg_count; if (!cptr->c_text) { cptr->c_text = tmpbuf; diff --git a/uip/replsbr.c b/uip/replsbr.c index b8e8e92..0d375ae 100644 --- a/uip/replsbr.c +++ b/uip/replsbr.c @@ -159,7 +159,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen, */ if ((cptr = wantcomp[CHASH(name)])) do { - if (!strcasecmp(name, cptr->c_name)) { + if (!mh_strcasecmp(name, cptr->c_name)) { char_read += msg_count; if (! cptr->c_text) { i = strlen(cptr->c_text = tmpbuf) - 1; @@ -391,8 +391,8 @@ insert (struct mailname *np) return 0; for (mp = &mq; mp->m_next; mp = mp->m_next) { - if (!strcasecmp (np->m_host, mp->m_next->m_host) - && !strcasecmp (np->m_mbox, mp->m_next->m_mbox)) + if (!mh_strcasecmp (np->m_host, mp->m_next->m_host) + && !mh_strcasecmp (np->m_mbox, mp->m_next->m_mbox)) return 0; } if (!ccme && ismymbox (np)) diff --git a/uip/scansbr.c b/uip/scansbr.c index 3bede5a..d9d6bee 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -203,7 +203,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, */ if ((cptr = wantcomp[CHASH(name)])) { do { - if (!strcasecmp(name, cptr->c_name)) { + if (!mh_strcasecmp(name, cptr->c_name)) { if (! cptr->c_text) { cptr->c_text = tmpbuf; for (cp = tmpbuf + strlen (tmpbuf) - 1; diff --git a/uip/sendsbr.c b/uip/sendsbr.c index cc15a0f..8930857 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -401,7 +401,7 @@ make_mime_composition_file_entry(char *file_name, int attachformat) if ((p = strrchr(file_name, '.')) != (char *)0) { for (np = m_defs; np; np = np->n_next) { - if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && strcasecmp(p, np->n_field) == 0) { + if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && mh_strcasecmp(p, np->n_field) == 0) { content_type = np->n_name + 14; break; } @@ -551,13 +551,13 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay) /* * This header field is discarded. */ - if (!strcasecmp (name, "Message-ID")) { + if (!mh_strcasecmp (name, "Message-ID")) { while (state == FLDPLUS) state = m_getfld (state, name, buffer, sizeof(buffer), in); } else if (uprf (name, XXX_FIELD_PRF) - || !strcasecmp (name, VRSN_FIELD) - || !strcasecmp (name, "Subject") - || !strcasecmp (name, "Encrypted")) { + || !mh_strcasecmp (name, VRSN_FIELD) + || !mh_strcasecmp (name, "Subject") + || !mh_strcasecmp (name, "Encrypted")) { /* * These header fields are copied to the enclosed * header of the first message in the collection @@ -566,7 +566,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay) * version of it, can be copied to the header * of each messsage/partial in the collection. */ - if (!strcasecmp (name, "Subject")) { + if (!mh_strcasecmp (name, "Subject")) { size_t sublen; strncpy (subject, buffer, BUFSIZ); diff --git a/uip/show.c b/uip/show.c index b068d49..31a05e9 100644 --- a/uip/show.c +++ b/uip/show.c @@ -81,9 +81,9 @@ main (int argc, char **argv) /* read user profile/context */ context_read(); - if (!strcasecmp (invo_name, "next")) { + if (!mh_strcasecmp (invo_name, "next")) { mode = NEXT; - } else if (!strcasecmp (invo_name, "prev")) { + } else if (!mh_strcasecmp (invo_name, "prev")) { mode = PREV; } arguments = getarguments (invo_name, argc, argv, 1); @@ -400,7 +400,7 @@ is_nontext (char *msgnam) /* * Check Content-Type field */ - if (!strcasecmp (name, TYPE_FIELD)) { + if (!mh_strcasecmp (name, TYPE_FIELD)) { int passno; char c; @@ -455,7 +455,7 @@ invalid: if (!*bp) goto invalid; if (passno > 1) { - if ((result = (strcasecmp (bp, "plain") != 0))) + if ((result = (mh_strcasecmp (bp, "plain") != 0))) goto out; *dp = c; for (dp++; isspace (*dp); dp++) @@ -487,7 +487,7 @@ invalid: /* Check the character set */ result = !check_charset (dp, strlen (dp)); } else { - if (!(result = (strcasecmp (bp, "text") != 0))) { + if (!(result = (mh_strcasecmp (bp, "text") != 0))) { *dp = c; bp = dp; passno = 2; @@ -506,7 +506,7 @@ out: /* * Check Content-Transfer-Encoding field */ - if (!strcasecmp (name, ENCODING_FIELD)) { + if (!mh_strcasecmp (name, ENCODING_FIELD)) { cp = add (buf, NULL); while (state == FLDPLUS) { state = m_getfld (state, name, buf, sizeof(buf), fp); @@ -517,9 +517,9 @@ out: for (dp = bp; istoken (*dp); dp++) continue; *dp = '\0'; - result = (strcasecmp (bp, "7bit") - && strcasecmp (bp, "8bit") - && strcasecmp (bp, "binary")); + result = (mh_strcasecmp (bp, "7bit") + && mh_strcasecmp (bp, "8bit") + && mh_strcasecmp (bp, "binary")); free (cp); if (result) { diff --git a/uip/slocal.c b/uip/slocal.c index 275eedd..817a411 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -554,7 +554,7 @@ usr_delivery (int fd, char *delivery, int su) } if (vecp > 5) { - if (!strcasecmp (vec[5], "select")) { + if (!mh_strcasecmp (vec[5], "select")) { if (logged_in () != -1) continue; if (vecp > 7 && timely (vec[6], vec[7]) == -1) @@ -573,7 +573,7 @@ usr_delivery (int fd, char *delivery, int su) * "default" matches only if the message hasn't * been delivered yet. */ - if (!strcasecmp (field, "default")) { + if (!mh_strcasecmp (field, "default")) { if (won) continue; break; @@ -603,7 +603,7 @@ usr_delivery (int fd, char *delivery, int su) switch (*action) { case 'q': /* deliver to quoted pipe */ - if (strcasecmp (action, "qpipe")) + if (mh_strcasecmp (action, "qpipe")) continue; /* else fall */ case '^': expand (tmpbuf, string, fd); @@ -614,7 +614,7 @@ usr_delivery (int fd, char *delivery, int su) case 'p': /* deliver to pipe */ - if (strcasecmp (action, "pipe")) + if (mh_strcasecmp (action, "pipe")) continue; /* else fall */ case '|': vec[2] = "sh"; @@ -627,12 +627,12 @@ usr_delivery (int fd, char *delivery, int su) case 'f': /* mbox format */ - if (!strcasecmp (action, "file")) { + if (!mh_strcasecmp (action, "file")) { status = usr_file (fd, string, MBOX_FORMAT); break; } /* deliver to nmh folder */ - else if (strcasecmp (action, "folder")) + else if (mh_strcasecmp (action, "folder")) continue; /* else fall */ case '+': status = usr_folder (fd, string); @@ -640,12 +640,12 @@ usr_delivery (int fd, char *delivery, int su) case 'm': /* mmdf format */ - if (!strcasecmp (action, "mmdf")) { + if (!mh_strcasecmp (action, "mmdf")) { status = usr_file (fd, string, MMDF_FORMAT); break; } /* mbox format */ - else if (strcasecmp (action, "mbox")) + else if (mh_strcasecmp (action, "mbox")) continue; /* else fall */ case '>': @@ -655,7 +655,7 @@ usr_delivery (int fd, char *delivery, int su) case 'd': /* ignore message */ - if (strcasecmp (action, "destroy")) + if (mh_strcasecmp (action, "destroy")) continue; status = 0; break; @@ -779,7 +779,7 @@ parse (int fd) lp = add (field, lp); } for (p = hdrs; p->p_name; p++) { - if (!strcasecmp (p->p_name, name)) { + if (!mh_strcasecmp (p->p_name, name)) { if (!(p->p_flags & P_HID)) { if ((cp = p->p_value)) { if (p->p_flags & P_ADR) { @@ -933,7 +933,7 @@ static struct pair * lookup (struct pair *pairs, char *key) { for (; pairs->p_name; pairs++) - if (!strcasecmp (pairs->p_name, key)) + if (!mh_strcasecmp (pairs->p_name, key)) return pairs; return NULL; @@ -1537,7 +1537,7 @@ suppress_duplicates (int fd, char *file) case FLDPLUS: case FLDEOF: /* Search for the message ID */ - if (strcasecmp (name, "Message-ID")) { + if (mh_strcasecmp (name, "Message-ID")) { while (state == FLDPLUS) state = m_getfld (state, name, buf, sizeof(buf), in); continue; diff --git a/uip/sortm.c b/uip/sortm.c index 5888d78..9263c79 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -365,7 +365,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) case FLDEOF: case FLDPLUS: compnum++; - if (!strcasecmp (nam, datesw)) { + if (!mh_strcasecmp (nam, datesw)) { datecomp = add (buf, datecomp); while (state == FLDPLUS) { state = m_getfld (state, nam, buf, sizeof(buf), in); @@ -373,7 +373,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg) } if (!subjsort || subjcomp) break; - } else if (subjsort && !strcasecmp (nam, subjsort)) { + } else if (subjsort && !mh_strcasecmp (nam, subjsort)) { subjcomp = add (buf, subjcomp); while (state == FLDPLUS) { state = m_getfld (state, nam, buf, sizeof(buf), in); diff --git a/uip/spost.c b/uip/spost.c index c86ea18..bef70be 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -631,7 +631,7 @@ get_header (char *header, struct headers *table) struct headers *h; for (h = table; h->value; h++) - if (!strcasecmp (header, h->value)) + if (!mh_strcasecmp (header, h->value)) return (h - table); return NOTOK; -- 1.7.10.4