X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1f21da770395e0df90f29a5fe81fa428ab444c21..ab1b16d2e7d450da5f5a1ec57dbaa1bc6517258d:/uip/mhfixmsg.c?ds=inline

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index d1d796c1..2a705114 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -53,15 +53,11 @@ int debugsw; /* Needed by mhparse.c. */
 extern int skip_mp_cte_check;                 /* flag to InitMultiPart */
 extern int suppress_bogus_mp_content_warning; /* flag to InitMultiPart */
 extern int bogus_mp_content;                  /* flag from InitMultiPart */
-CT parse_mime (char *);
 void reverse_parts (CT);
 
 /* mhoutsbr.c */
 int output_message (CT, char *);
 
-/* mhshowsbr.c */
-int show_content_aux (CT, int, char *, char *);
-
 /* mhmisc.c */
 void flush_errors (void);
 
@@ -1095,40 +1091,25 @@ reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) {
        Could show_multi() in mhshowsbr.c avoid this? */
 
     /* Check for invo_name-format-type/subtype. */
-    cp = concat (invo_name, "-format-", type, "/", subtype, NULL);
-    if ((cf = context_find (cp))  &&  *cf != '\0') {
+    if ((cf = context_find_by_type ("format", type, subtype)) == NULL) {
+        if (verbosw) {
+            advise (NULL, "Don't know how to convert %s, there is no "
+                    "%s-format-%s/%s profile entry",
+                    ct->c_file, invo_name, type, subtype);
+        }
+        return NOTOK;
+    } else {
         if (strchr (cf, '>')) {
-            free (cp);
             advise (NULL, "'>' prohibited in \"%s\",\nplease fix your "
                     "%s-format-%s/%s profile entry", cf, invo_name, type,
-                    subtype);
-            return NOTOK;
-        }
-    } else {
-        free (cp);
-
-        /* Check for invo_name-format-type. */
-        cp = concat (invo_name, "-format-", type, NULL);
-        if (! (cf = context_find (cp))  ||  *cf == '\0') {
-            free (cp);
-            if (verbosw) {
-                advise (NULL, "Don't know how to convert %s, there is no "
-                        "%s-format-%s/%s profile entry",
-                        ct->c_file, invo_name, type, subtype);
-            }
-            return NOTOK;
-        }
+                    subtype ? subtype : "");
 
-        if (strchr (cf, '>')) {
-            free (cp);
-            advise (NULL, "'>' prohibited in \"%s\"", cf);
             return NOTOK;
         }
     }
-    free (cp);
 
     cp = concat (cf, " >", file, NULL);
-    status = show_content_aux (ct, 0, cp, NULL);
+    status = show_content_aux (ct, 0, cp, NULL, NULL);
     free (cp);
 
     /* Unlink decoded content tmp file and free its filename to avoid