X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmshcmds.c;h=f2c913cd1b9623587c3f34ece4cc89c0b43a593a;hp=b8c7d9253dce5daa57ad38008e4ab62216b24828;hb=d2f12554a254e814dcdafb3828fc0d9936154eef;hpb=8f4c5da8971926f7eccc912f7998c343aef3c33b

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index b8c7d92..f2c913c 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -3,6 +3,10 @@
  * mshcmds.c -- command handlers in msh
  *
  * $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.
  */
 
 #include <h/mh.h>
@@ -11,14 +15,14 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <mts/generic/mts.h>
+#include <h/mts.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <h/msh.h>
 #include <h/picksbr.h>
+#include <h/utils.h>
 
-extern int errno;
 
 static char delim3[] = "-------";	/* from burst.c */
 
@@ -2157,8 +2161,7 @@ scancmd (char **args)
 		if (*dp == '\\' || *dp == '"' || *dp == '\n')
 		    i++;
 	    i++;
-	    if ((ep = malloc ((unsigned) i)) == NULL)
-		adios (NULL, "out of memory");
+	    ep = mh_xmalloc ((unsigned) i);
 	    for (dp = nfs, fp = ep; *dp; dp++) {
 		if (*dp == '\n') {
 		    *fp++ = '\\', *fp++ = 'n';
@@ -2307,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 == '-')
@@ -2562,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;
 
@@ -2617,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++)
@@ -2649,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;
@@ -2668,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);
@@ -2679,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) {
@@ -2865,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);
@@ -2882,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);
@@ -2962,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:"))
@@ -3005,7 +3008,6 @@ process (int msgnum, char *proc, int vecp, char **vec)
     strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil));
     if ((out = fopen (tmpfil, "w")) == NULL) {
 	int olderr;
-	extern int errno;
 	char newfil[80];
 
 	olderr = errno;