X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=handler.c;h=5d9af6ddc8b914ca2df703cde69102a008376666;hb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37;hp=e7ca176535e862b3782382d3bcf68753fd48454b;hpb=c65e926c6633e7247003bfc8e484a9a2179a5497;p=apps%2Fmadmutt.git

diff --git a/handler.c b/handler.c
index e7ca176..5d9af6d 100644
--- a/handler.c
+++ b/handler.c
@@ -783,12 +783,10 @@ static int alternative_handler (BODY * a, STATE * s)
     fstat (fileno (s->fpin), &st);
     b = mutt_new_body ();
     b->length = (long) st.st_size;
-    b->parts = mutt_parse_multipart (s->fpin,
-                                     mutt_get_parameter ("boundary",
-                                                         a->parameter),
-                                     (long) st.st_size,
-                                     ascii_strcasecmp ("digest",
-                                                       a->subtype) == 0);
+    b->parts = mutt_parse_multipart(s->fpin,
+                                    parameter_getval(a->parameter, "boundary"),
+                                    (long)st.st_size,
+                                    !ascii_strcasecmp("digest", a->subtype));
   }
   else
     b = a;
@@ -999,12 +997,10 @@ static int multipart_handler (BODY * a, STATE * s)
     fstat (fileno (s->fpin), &st);
     b = mutt_new_body ();
     b->length = (long) st.st_size;
-    b->parts = mutt_parse_multipart (s->fpin,
-                                     mutt_get_parameter ("boundary",
-                                                         a->parameter),
-                                     (long) st.st_size,
-                                     ascii_strcasecmp ("digest",
-                                                       a->subtype) == 0);
+    b->parts = mutt_parse_multipart(s->fpin,
+                                    parameter_getval(a->parameter, "boundary"),
+                                    (long)st.st_size,
+                                    !ascii_strcasecmp("digest", a->subtype));
   }
   else
     b = a;
@@ -1179,7 +1175,7 @@ static int external_body_handler (BODY * b, STATE * s)
   const char *expiration;
   time_t expire;
 
-  access_type = mutt_get_parameter ("access-type", b->parameter);
+  access_type = parameter_getval(b->parameter, "access-type");
   if (!access_type) {
     if (s->flags & M_DISPLAY) {
       state_mark_attach (s);
@@ -1188,7 +1184,7 @@ static int external_body_handler (BODY * b, STATE * s)
     return (-1);
   }
 
-  expiration = mutt_get_parameter ("expiration", b->parameter);
+  expiration = parameter_getval(b->parameter, "expiration");
   if (expiration)
     expire = mutt_parse_date (expiration, NULL);
   else
@@ -1202,7 +1198,7 @@ static int external_body_handler (BODY * b, STATE * s)
       state_mark_attach (s);
       state_printf (s, _("[-- This %s/%s attachment "),
                     TYPE (b->parts), b->parts->subtype);
-      length = mutt_get_parameter ("length", b->parameter);
+      length = parameter_getval(b->parameter, "length");
       if (length) {
         mutt_pretty_size (pretty_size, sizeof (pretty_size),
                           strtol (length, NULL, 10));
@@ -1265,7 +1261,7 @@ void mutt_decode_attachment (BODY * b, STATE * s)
 
   if (istext) {
     if (s->flags & M_CHARCONV) {
-      const char *charset = mutt_get_parameter ("charset", b->parameter);
+      const char *charset = parameter_getval(b->parameter, "charset");
 
       if (!option (OPTSTRICTMIME) && !charset)
         charset = charset_getfirst(AssumedCharset);
@@ -1336,9 +1332,8 @@ int mutt_body_handler (BODY * b, STATE * s)
       if (mutt_is_application_pgp (b))
         handler = crypt_pgp_application_pgp_handler;
       else
-        if (ascii_strcasecmp
-            ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
-        handler = rfc3676_handler;
+        if (!ascii_strcasecmp("flowed", parameter_getval(b->parameter, "format")))
+          handler = rfc3676_handler;
       else
         plaintext = 1;
     }
@@ -1361,7 +1356,7 @@ int mutt_body_handler (BODY * b, STATE * s)
     if (ascii_strcasecmp ("alternative", b->subtype) == 0)
       handler = alternative_handler;
     else if (ascii_strcasecmp ("signed", b->subtype) == 0) {
-      p = mutt_get_parameter ("protocol", b->parameter);
+      p = parameter_getval(b->parameter, "protocol");
 
       if (!p)
         mutt_error (_("Error: multipart/signed has no protocol."));
@@ -1370,7 +1365,7 @@ int mutt_body_handler (BODY * b, STATE * s)
         handler = mutt_signed_handler;
     }
     else if (m_strcasecmp("encrypted", b->subtype) == 0) {
-      p = mutt_get_parameter ("protocol", b->parameter);
+      p = parameter_getval(b->parameter, "protocol");
 
       if (!p)
         mutt_error (_