X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=da10849406f5df4ab9b1ec86a3ee2317d1aeca83;hp=2ecf57765d7ba77b4a5691defe1cecbc12898a0f;hb=1d2617e5d89468db7cd1b93fd2b31af73cd7c8ff;hpb=024fe257a96f97619e236bbdafe57b63101eb17f diff --git a/handler.c b/handler.c index 2ecf577..da10849 100644 --- a/handler.c +++ b/handler.c @@ -22,11 +22,9 @@ #include "keymap.h" #include "copy.h" #include "charset.h" -#include +#include "crypt.h" #include "state.h" #include "attach.h" -#include "lib.h" - typedef int handler_f (BODY *, STATE *); typedef handler_f *handler_t; @@ -270,16 +268,14 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) state_reset_prefix (s); } -static unsigned char decode_byte (char ch) +static unsigned char decode_byte(int ch) { - if (ch == 96) - return 0; - return ch - 32; + return ch == 96 ? 0 : ch - 32; } static void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd) { - char tmps[SHORT_STRING]; + char tmps[STRING]; char linelen, c, l, out; char *pt; char bufi[BUFI_SIZE]; @@ -302,13 +298,13 @@ static void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd) if (!m_strncmp(tmps, "end", 3)) break; pt = tmps; - linelen = decode_byte (*pt); + linelen = decode_byte(*pt); pt++; for (c = 0; c < linelen;) { for (l = 2; l <= 6; l += 2) { - out = decode_byte (*pt) << l; + out = decode_byte(*pt) << l; pt++; - out |= (decode_byte (*pt) >> (6 - l)); + out |= (decode_byte(*pt) >> (6 - l)); bufi[k++] = out; c++; if (c == linelen) @@ -340,22 +336,21 @@ static struct { const char *tag_name; int index; } EnrichedTags[] = { - { - "param", RICH_PARAM}, { - "bold", RICH_BOLD}, { - "italic", RICH_ITALIC}, { - "underline", RICH_UNDERLINE}, { - "nofill", RICH_NOFILL}, { - "excerpt", RICH_EXCERPT}, { - "indent", RICH_INDENT}, { - "indentright", RICH_INDENT_RIGHT}, { - "center", RICH_CENTER}, { - "flushleft", RICH_FLUSHLEFT}, { - "flushright", RICH_FLUSHRIGHT}, { - "flushboth", RICH_FLUSHLEFT}, { - "color", RICH_COLOR}, { - "x-color", RICH_COLOR}, { - NULL, -1} + {"param", RICH_PARAM}, + {"bold", RICH_BOLD}, + {"italic", RICH_ITALIC}, + {"underline", RICH_UNDERLINE}, + {"nofill", RICH_NOFILL}, + {"excerpt", RICH_EXCERPT}, + {"indent", RICH_INDENT}, + {"indentright", RICH_INDENT_RIGHT}, + {"center", RICH_CENTER}, + {"flushleft", RICH_FLUSHLEFT}, + {"flushright", RICH_FLUSHRIGHT}, + {"flushboth", RICH_FLUSHLEFT}, + {"color", RICH_COLOR}, + {"x-color", RICH_COLOR}, + {NULL, -1} }; struct enriched_state { @@ -541,8 +536,7 @@ static void enriched_putc (int c, struct enriched_state *stte) else { stte->buffer[stte->buff_used++] = c; } - } - else { + } else { stte->buffer[stte->buff_used++] = c; } stte->word_len++; @@ -773,7 +767,7 @@ static int alternative_handler (BODY * a, STATE * s) b->parts = mutt_parse_multipart(s->fpin, parameter_getval(a->parameter, "boundary"), (long)st.st_size, - !ascii_strcasecmp("digest", a->subtype)); + mime_which_token(a->subtype, -1) == MIME_DIGEST); } else b = a; @@ -843,18 +837,27 @@ static int alternative_handler (BODY * a, STATE * s) b = a; while (b) { if (b->type == TYPETEXT) { - if (!ascii_strcasecmp ("plain", b->subtype) && type <= TXTPLAIN) { - choice = b; - type = TXTPLAIN; - } - else if (!ascii_strcasecmp ("enriched", b->subtype) - && type <= TXTENRICHED) { - choice = b; - type = TXTENRICHED; - } - else if (!ascii_strcasecmp ("html", b->subtype) && type <= TXTHTML) { - choice = b; - type = TXTHTML; + switch (mime_which_token(b->subtype, -1)) { + case MIME_PLAIN: + if (type <= TXTPLAIN) { + choice = b; + type = TXTPLAIN; + } + break; + case MIME_ENRICHED: + if (type <= TXTENRICHED) { + choice = b; + type = TXTENRICHED; + } + break; + case MIME_HTML: + if (type <= TXTHTML) { + choice = b; + type = TXTHTML; + } + break; + default: + break; } } b = b->next; @@ -950,16 +953,15 @@ int mutt_can_decode (BODY * a) return (1); else if (a->type == TYPEMULTIPART) { BODY *p; + int tok = mime_which_token(a->subtype, -1); - if (ascii_strcasecmp (a->subtype, "signed") == 0 || - ascii_strcasecmp (a->subtype, "encrypted") == 0) - return (1); + if (tok == MIME_SIGNED || tok == MIME_ENCRYPTED) + return 1; for (p = a->parts; p; p = p->next) { if (mutt_can_decode (p)) return (1); } - } else if (a->type == TYPEAPPLICATION) { if (mutt_is_application_pgp(a)) @@ -987,10 +989,10 @@ static int multipart_handler (BODY * a, STATE * s) b->parts = mutt_parse_multipart(s->fpin, parameter_getval(a->parameter, "boundary"), (long)st.st_size, - !ascii_strcasecmp("digest", a->subtype)); - } - else + mime_which_token(a->subtype, -1) == MIME_DIGEST); + } else { b = a; + } for (p = b->parts, count = 1; p; p = p->next, count++) { if (s->flags & M_DISPLAY) { @@ -1085,8 +1087,7 @@ static int autoview_handler (BODY * a, STATE * s) if (!piped) { m_fclose(&fpin); thepid = mutt_create_filter (command, NULL, &fpout, &fperr); - } - else { + } else { unlink (tempfile); fflush (fpin); rewind (fpin); @@ -1124,8 +1125,7 @@ static int autoview_handler (BODY * a, STATE * s) state_puts (buffer, s); } } - } - else { + } else { mutt_copy_stream (fpout, s->fpout); /* Check for stderr messages */ if (fgets (buffer, sizeof (buffer), fperr)) { @@ -1177,7 +1177,7 @@ static int external_body_handler (BODY * b, STATE * s) else expire = -1; - if (!ascii_strcasecmp (access_type, "x-mutt-deleted")) { + if (mime_which_token(access_type, -1) == MIME_X_MUTT_DELETED) { if (s->flags & (M_DISPLAY | M_PRINTING)) { char *length; char pretty_size[10]; @@ -1219,8 +1219,7 @@ static int external_body_handler (BODY * b, STATE * s) (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE, NULL); } - } - else { + } else { if (s->flags & M_DISPLAY) { state_mark_attach (s); state_printf (s, @@ -1251,12 +1250,12 @@ void mutt_decode_attachment (BODY * b, STATE * s) const char *charset = parameter_getval(b->parameter, "charset"); if (!charset) - charset = charset_getfirst(AssumedCharset); - if (charset && Charset) - cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM); + charset = charset_getfirst(MCharset.assumed_charset); + if (charset && MCharset.charset) + cd = mutt_iconv_open (MCharset.charset, charset, M_ICONV_HOOK_FROM); } else { if (b->file_charset) - cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM); + cd = mutt_iconv_open (MCharset.charset, b->file_charset, M_ICONV_HOOK_FROM); } } @@ -1297,6 +1296,7 @@ int mutt_body_handler (BODY * b, STATE * s) int rc = 0; int oflags = s->flags; + int tok = mime_which_token(b->subtype, -1); /* first determine which handler to use to process this part */ @@ -1311,7 +1311,7 @@ int mutt_body_handler (BODY * b, STATE * s) rfc1524_entry_delete(&entry); } else if (b->type == TYPETEXT) { - if (ascii_strcasecmp ("plain", b->subtype) == 0) { + if (tok == MIME_PLAIN) { /* avoid copying this part twice since removing the transfer-encoding is * the only operation needed. */ @@ -1323,7 +1323,7 @@ int mutt_body_handler (BODY * b, STATE * s) else plaintext = 1; } - else if (ascii_strcasecmp ("enriched", b->subtype) == 0) + else if (tok == MIME_ENRICHED) handler = text_enriched_handler; else /* text body type without a handler */ plaintext = 1; @@ -1331,17 +1331,17 @@ int mutt_body_handler (BODY * b, STATE * s) else if (b->type == TYPEMESSAGE) { if (mutt_is_message_type (b)) handler = message_handler; - else if (!ascii_strcasecmp ("delivery-status", b->subtype)) + else if (tok == MIME_DELIVERY_STATUS) plaintext = 1; - else if (!ascii_strcasecmp ("external-body", b->subtype)) + else if (tok == MIME_EXTERNAL_BODY) handler = external_body_handler; } else if (b->type == TYPEMULTIPART) { char *p; - if (ascii_strcasecmp ("alternative", b->subtype) == 0) + if (tok == MIME_ALTERNATIVE) handler = alternative_handler; - else if (ascii_strcasecmp ("signed", b->subtype) == 0) { + else if (tok == MIME_SIGNED) { p = parameter_getval(b->parameter, "protocol"); if (!p) @@ -1350,14 +1350,12 @@ int mutt_body_handler (BODY * b, STATE * s) else if (s->flags & M_VERIFY) handler = mutt_signed_handler; } - else if (m_strcasecmp("encrypted", b->subtype) == 0) { + else if (tok == MIME_ENCRYPTED) { p = parameter_getval(b->parameter, "protocol"); if (!p) - mutt_error (_ - ("Error: multipart/encrypted has no protocol parameter!")); - - else if (ascii_strcasecmp ("application/pgp-encrypted", p) == 0) + mutt_error(_("Error: multipart/encrypted has no protocol parameter!")); + else if (mime_which_token(p, -1) == MIME_APPLICATION_PGP_ENCRYPTED) handler = crypt_pgp_encrypted_handler; } @@ -1371,23 +1369,21 @@ int mutt_body_handler (BODY * b, STATE * s) handler = crypt_smime_application_smime_handler; } - if (plaintext || handler) { fseeko (s->fpin, b->offset, 0); /* see if we need to decode this part before processing it */ - if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE || b->encoding == ENCUUENCODED || plaintext || mutt_is_text_part (b)) { /* text subtypes may - * require character - * set conversion even - * with 8bit encoding. - */ + if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE + || b->encoding == ENCUUENCODED || plaintext || mutt_is_text_part (b)) { + /* text subtypes may require character set conversion even with 8bit + encoding. */ int origType = b->type; char *savePrefix = NULL; if (!plaintext) { /* decode to a tempfile, saving the original destination */ fp = s->fpout; - s->fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + s->fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL); if (!s->fpout) { mutt_error _("Unable to open temporary file!"); goto bail;