From: David Levine <levinedl@acm.org>
Date: Sun, 24 Mar 2013 16:28:51 +0000 (-0500)
Subject: More replacements of mh_strcasecmp() with strcasecmp().
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/487ad115de1c5a97ab4e61bbf3f3bbbdbd97b258?ds=sidebyside;hp=475649a9d4bc5abb5028392da45f3ec3306288f6

More replacements of mh_strcasecmp() with strcasecmp().
---

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 929b4914..bb0b2c78 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -170,7 +170,7 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 	mp->m_mbox = getcpy (mbox);
 	mp->m_host = getcpy (host);
 	mp->m_type =
-	    mh_strcasecmp (LocalName(0), mp->m_host) ? NETHOST : LOCALHOST;
+	    strcasecmp (LocalName(0), mp->m_host) ? NETHOST : LOCALHOST;
     } else {
 	if ((pp = strchr(mbox, '!'))) {
 	    *pp++ = '\0';
@@ -411,11 +411,11 @@ ismymbox (struct mailname *np)
 		goto local_test;
 
 	    case UUCPHOST:
-		if (mh_strcasecmp (np->m_host, SystemName()))
+		if (strcasecmp (np->m_host, SystemName()))
 		    break;		/* fall */
 	    case LOCALHOST:
 local_test: ;
-		if (!mh_strcasecmp (np->m_mbox, mq.m_mbox))
+		if (!strcasecmp (np->m_mbox, mq.m_mbox))
 		    return 1;
 		break;
 
@@ -435,11 +435,11 @@ local_test: ;
 	    continue;
 	switch (mp->m_type & W_MBOX) {
 	    case W_NIL: 
-		if (mh_strcasecmp (cp, pp))
+		if (strcasecmp (cp, pp))
 		    continue;
 		break;
 	    case W_MBEG: 
-		if (mh_strcasecmp (cp + len - i, pp))
+		if (strcasecmp (cp + len - i, pp))
 		    continue;
 		break;
 	    case W_MEND: 
@@ -461,11 +461,11 @@ local_test: ;
 	    continue;
 	switch (mp->m_type & W_HOST) {
 	    case W_NIL: 
-		if (mh_strcasecmp (cp, pp))
+		if (strcasecmp (cp, pp))
 		    continue;
 		break;
 	    case W_HBEG: 
-		if (mh_strcasecmp (cp + len - i, pp))
+		if (strcasecmp (cp + len - i, pp))
 		    continue;
 		break;
 	    case W_HEND: 
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 2a5ad829..10b5f9bd 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -438,7 +438,8 @@ 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 && mh_strcasecmp(p, np->n_field) == 0) {
+	    if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 &&
+                strcasecmp(p, np->n_field ? np->n_field : "") == 0) {
 		content_type = np->n_name + 14;
 		break;
 	    }
@@ -616,15 +617,15 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 		/*
 		 * This header field is discarded.
 		 */
-		if (!mh_strcasecmp (name, "Message-ID")) {
+		if (!strcasecmp (name, "Message-ID")) {
 		    while (state == FLDPLUS) {
 			bufsz = sizeof buffer;
 			state = m_getfld (&gstate, name, buffer, &bufsz, in);
 		    }
 		} else if (uprf (name, XXX_FIELD_PRF)
-			|| !mh_strcasecmp (name, VRSN_FIELD)
-			|| !mh_strcasecmp (name, "Subject")
-		        || !mh_strcasecmp (name, "Encrypted")) {
+			|| !strcasecmp (name, VRSN_FIELD)
+			|| !strcasecmp (name, "Subject")
+		        || !strcasecmp (name, "Encrypted")) {
 		    /*
 		     * These header fields are copied to the enclosed
 		     * header of the first message in the collection
@@ -633,7 +634,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 		     * version of it, can be copied to the header
 		     * of each messsage/partial in the collection.
 		     */
-		    if (!mh_strcasecmp (name, "Subject")) {
+		    if (!strcasecmp (name, "Subject")) {
 			size_t sublen;
 
 			strncpy (subject, buffer, BUFSIZ);
diff --git a/uip/show.c b/uip/show.c
index b73e56a8..bd5282ba 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -69,9 +69,9 @@ main (int argc, char **argv)
     /* read user profile/context */
     context_read();
 
-    if (!mh_strcasecmp (invo_name, "next")) {
+    if (!strcasecmp (invo_name, "next")) {
 	mode = NEXT;
-    } else if (!mh_strcasecmp (invo_name, "prev")) {
+    } else if (!strcasecmp (invo_name, "prev")) {
 	mode = PREV;
     }
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -346,7 +346,7 @@ is_nontext (char *msgnam)
 	    /*
 	     * Check Content-Type field
 	     */
-	    if (!mh_strcasecmp (name, TYPE_FIELD)) {
+	    if (!strcasecmp (name, TYPE_FIELD)) {
 		int passno;
 		char c;
 
@@ -402,7 +402,7 @@ invalid:
 		if (!*bp)
 		    goto invalid;
 		if (passno > 1) {
-		    if ((result = (mh_strcasecmp (bp, "plain") != 0)))
+		    if ((result = (strcasecmp (bp, "plain") != 0)))
 			goto out;
 		    *dp = c;
 		    for (dp++; isspace ((unsigned char) *dp); dp++)
@@ -434,7 +434,7 @@ invalid:
 		    /* Check the character set */
 		    result = !check_charset (dp, strlen (dp));
 		} else {
-		    if (!(result = (mh_strcasecmp (bp, "text") != 0))) {
+		    if (!(result = (strcasecmp (bp, "text") != 0))) {
 			*dp = c;
 			bp = dp;
 			passno = 2;
@@ -454,7 +454,7 @@ out:
 	    /*
 	     * Check Content-Transfer-Encoding field
 	     */
-	    if (!mh_strcasecmp (name, ENCODING_FIELD)) {
+	    if (!strcasecmp (name, ENCODING_FIELD)) {
 		cp = add (buf, NULL);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
@@ -466,9 +466,9 @@ out:
 		for (dp = bp; istoken ((unsigned char) *dp); dp++)
 		    continue;
 		*dp = '\0';
-		result = (mh_strcasecmp (bp, "7bit")
-		       && mh_strcasecmp (bp, "8bit")
-		       && mh_strcasecmp (bp, "binary"));
+		result = (strcasecmp (bp, "7bit")
+		       && strcasecmp (bp, "8bit")
+		       && strcasecmp (bp, "binary"));
 
 		free (cp);
 		if (result) {