X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhmisc.c;h=86b8ad804f52212f070e261bf123d14ba6183246;hb=884c2f0375bc6108a9902bf0971844d34585c418;hp=80ebcbb67165dc91a890f51351b837e12f0c88d8;hpb=794dab6aa5027ffaf024506140c258f6a0a9322d;p=mmh diff --git a/uip/mhmisc.c b/uip/mhmisc.c index 80ebcbb..86b8ad8 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 #include #include #include +#include -extern int errno; extern int debugsw; /* @@ -21,7 +23,6 @@ int ntype = 0; char *parts[NPARTS + 1]; char *types[NTYPES + 1]; -int endian = 0; /* little or big endian */ int userrs = 0; static char *errs = NULL; @@ -32,8 +33,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 +41,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,29 +69,13 @@ 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; } -void -set_endian (void) -{ - union { - long l; - char c[sizeof(long)]; - } un; - - un.l = 1; - endian = un.c[0] ? -1 : 1; - if (debugsw) - fprintf (stderr, "%s endian architecture\n", - endian > 0 ? "big" : "little"); -} - - int make_intermediates (char *file) {