X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..3789a22b9fd7711d55e9b54997e4677d2b96dc78:/uip/mhmisc.c diff --git a/uip/mhmisc.c b/uip/mhmisc.c index 7a231392..f4b89168 100644 --- a/uip/mhmisc.c +++ b/uip/mhmisc.c @@ -8,7 +8,6 @@ */ #include -#include #include #include #include @@ -23,7 +22,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; @@ -34,8 +32,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); @@ -72,28 +68,35 @@ type_ok (CT ct, int sP) snprintf (buffer, sizeof(buffer), "%s/%s", ci->ci_type, ci->ci_subtype); for (ap = types; *ap; ap++) - if (!mh_strcasecmp (*ap, ci->ci_type) || !mh_strcasecmp (*ap, buffer)) + if (!strcasecmp (*ap, ci->ci_type) || !strcasecmp (*ap, buffer)) return 1; return 0; } -void -set_endian (void) +/* + * Returns true if this content is marked as "inline". + * + * Technically we should check parent content to see if they have + * disposition to use as a default, but we don't right now. Maybe + * later .... + */ + +int +is_inline(CT ct) { - 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"); -} + /* + * If there isn't any disposition at all, it's "inline". Obviously + * if it's "inline", then it's inline. RFC 2183 says if it's an unknown + * disposition, treat it as 'attachment'. + */ + if (! ct->c_dispo_type || strcasecmp(ct->c_dispo_type, "inline") == 0) + return 1; + else + return 0; +} int make_intermediates (char *file)