X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhmisc.c;h=e8a30aceb1a5cdcfb2c051cc5413ef6cbc342fa3;hb=436e6b477fa6dabe40404c84334e148b49682708;hp=75ac158373b0e50121dd8f67d1bb9166f18cee48;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 75ac158..e8a30ac 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -2,15 +2,17 @@
 /*
  * mhparse.c -- misc routines to process MIME messages
  *
- * $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>
 #include <errno.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include <h/utils.h>
 
-extern int errno;
 extern int debugsw;
 
 /*
@@ -32,8 +34,6 @@ static char *errs = NULL;
  */
 int part_ok (CT, int);
 int type_ok (CT, int);
-void set_endian (void);
-int make_intermediates (char *);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 
@@ -42,13 +42,17 @@ int
 part_ok (CT ct, int sP)
 {
     char **ap;
+    int len;
 
     if (npart == 0 || (ct->c_type == CT_MULTIPART && (sP || ct->c_subtype)))
 	return 1;
 
-    for (ap = parts; *ap; ap++)
-	if (!strcmp (*ap, ct->c_partno))
-	    return 1;
+    for (ap = parts; *ap; ap++) {
+        len = strlen(*ap);
+        if (!strncmp (*ap, ct->c_partno, len) &&
+                (!ct->c_partno[len] || ct->c_partno[len] == '.' ))
+            return 1;
+    }
 
     return 0;
 }
@@ -66,7 +70,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;
@@ -94,7 +98,7 @@ make_intermediates (char *file)
 {
     char *cp;
 
-    for (cp = file + 1; cp = strchr(cp, '/'); cp++) {
+    for (cp = file + 1; (cp = strchr(cp, '/')); cp++) {
 	struct stat st;
 
 	*cp = '\0';