X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=47cbaca08cef7f5af68f496c9593419958bcc0dd;hp=fc8037279ca493f87a6e6c6fa38fb360f5f17def;hb=96e4b6de291b2195b26289fb03536acd101c6650;hpb=49081299c673ceebc38d9a4f0985608cb3aecfce diff --git a/handler.c b/handler.c index fc80372..47cbaca 100644 --- a/handler.c +++ b/handler.c @@ -25,13 +25,13 @@ #include #include +#include #include #include "mutt.h" #include "recvattach.h" #include "handler.h" -#include "rfc3676.h" #include "keymap.h" #include "copy.h" #include "charset.h" @@ -270,7 +270,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) else bufi[l++] = ch; - if (l + 8 >= sizeof (bufi)) + if (l + 8 >= ssizeof (bufi)) mutt_convert_to_state (cd, bufi, &l, s); } @@ -781,14 +781,12 @@ static int alternative_handler (BODY * a, STATE * s) mustfree = 1; fstat (fileno (s->fpin), &st); - b = mutt_new_body (); + b = body_new(); 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; @@ -905,7 +903,7 @@ static int alternative_handler (BODY * a, STATE * s) } if (mustfree) - mutt_free_body (&a); + body_list_wipe(&a); return (rc); } @@ -922,7 +920,7 @@ static int message_handler (BODY * a, STATE * s) if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) { fstat (fileno (s->fpin), &st); - b = mutt_new_body (); + b = body_new(); b->length = (long) st.st_size; b->parts = mutt_parse_messageRFC822 (s->fpin, b); } @@ -946,7 +944,7 @@ static int message_handler (BODY * a, STATE * s) if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) - mutt_free_body (&b); + body_list_wipe(&b); return (rc); } @@ -997,14 +995,12 @@ static int multipart_handler (BODY * a, STATE * s) if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) { fstat (fileno (s->fpin), &st); - b = mutt_new_body (); + b = body_new(); 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; @@ -1049,7 +1045,7 @@ static int multipart_handler (BODY * a, STATE * s) if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) - mutt_free_body (&b); + body_list_wipe(&b); return (rc); } @@ -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)); @@ -1259,16 +1255,16 @@ static int external_body_handler (BODY * b, STATE * s) void mutt_decode_attachment (BODY * b, STATE * s) { int istext = mutt_is_text_part (b); - iconv_t cd = (iconv_t) (-1); + iconv_t cd = MUTT_ICONV_ERROR; Quotebuf[0] = '\0'; 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 = mutt_get_first_charset (AssumedCharset); + charset = charset_getfirst(AssumedCharset); if (charset && Charset) cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM); } @@ -1298,7 +1294,7 @@ void mutt_decode_attachment (BODY * b, STATE * s) break; } - if (cd != (iconv_t) (-1)) + if (cd != MUTT_ICONV_ERROR) iconv_close (cd); } @@ -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 (_