move more things in the lib-mime

[apps/madmutt.git] / lib-mime / rfc1524.c

diff --git a/lib-mime/rfc1524.c b/lib-mime/rfc1524.c
index c2c8058..6c4f2e5 100644 (file)
--- a/lib-mime/rfc1524.c
+++ b/lib-mime/rfc1524.c
@@ -60,6 +60,43 @@
 #include "mime.h"
 #include "attach.h"
 
 #include "mime.h"
 #include "attach.h"
 

+void rfc1524_entry_wipe(rfc1524_entry *p)
+{
+    p_delete(&p->command);
+    p_delete(&p->testcommand);
+    p_delete(&p->composecommand);
+    p_delete(&p->composetypecommand);
+    p_delete(&p->editcommand);
+    p_delete(&p->printcommand);
+    p_delete(&p->nametemplate);
+    p_delete(&p->convert);
+}
+
+/* returns 1 if Mutt can't display this type of data, 0 otherwise */
+int rfc1524_mailcap_isneeded(BODY * m)
+{
+    int tok;
+
+    switch (m->type) {
+      case TYPEMULTIPART:
+      case TYPEMESSAGE:
+        return 0;
+
+      case TYPEAPPLICATION:
+        return !(mutt_is_application_pgp(m) || mutt_is_application_smime(m));
+
+      case TYPETEXT:
+        tok = mime_which_token(m->subtype, -1);
+        if (tok == MIME_PLAIN
+        ||  tok == MIME_RFC822_HEADERS
+        ||  tok == MIME_ENRICHED)
+            return 0;
+        break;
+    }
+
+    return 1;
+}
+

 /* The command semantics include the following:
  * %s is the filename that contains the mail body data
  * %t is the content type, like text/plain
 /* The command semantics include the following:
  * %s is the filename that contains the mail body data
  * %t is the content type, like text/plain


@@ -106,7 +143,7 @@ int rfc1524_expand_command(BODY *a, const char *filename, const char *mtype,
                 param[z] = '\0';
 
                 m_strcpy(pval, sizeof(pval),
                 param[z] = '\0';
 
                 m_strcpy(pval, sizeof(pval),

-                         mutt_get_parameter(param, a->parameter));
+                         parameter_getval(a->parameter, param));

 
                 if (option(OPTMAILCAPSANITIZE))
                     mutt_sanitize_filename(pval, 0);
 
                 if (option(OPTMAILCAPSANITIZE))
                     mutt_sanitize_filename(pval, 0);