X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=a2b3e9dc3d165f5526c3041541c8c4d6b8b3e8a6;hp=137cc7daba02f81f8029e3bc11a8ae241becd6dc;hb=1ffe18af5bf2fda6f7dc86c514b56c6a82ec3040;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199 diff --git a/handler.c b/handler.c index 137cc7d..a2b3e9d 100644 --- a/handler.c +++ b/handler.c @@ -22,18 +22,21 @@ #include #include #include +#include + +#include + +#include #include "mutt.h" #include "recvattach.h" #include "handler.h" -#include "mutt_curses.h" #include "rfc1524.h" #include "rfc3676.h" #include "keymap.h" -#include "mime.h" #include "copy.h" #include "charset.h" -#include "mutt_crypt.h" +#include #include "state.h" #include "attach.h" #include "lib.h" @@ -43,29 +46,7 @@ typedef int handler_f (BODY *, STATE *); typedef handler_f *handler_t; -int Index_hex[128] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, - -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 -}; - -int Index_64[128] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 -}; - -void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd) +static void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd) { int c, ch; char bufi[BUFI_SIZE]; @@ -241,7 +222,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) for (i = 0; i < 4 && len > 0; len--) { if ((ch = fgetc (s->fpin)) == EOF) break; - if (ch >= 0 && ch < 128 && (base64val (ch) != -1 || ch == '=')) + if (base64val(ch) >= 0 || ch == '=') buf[i++] = ch; } if (i != 4) { @@ -249,8 +230,8 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) break; } - c1 = base64val (buf[0]); - c2 = base64val (buf[1]); + c1 = base64val(buf[0]); + c2 = base64val(buf[1]); ch = (c1 << 2) | (c2 >> 4); if (cr && ch != '\n') @@ -265,7 +246,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) if (buf[2] == '=') break; - c3 = base64val (buf[2]); + c3 = base64val(buf[2]); ch = ((c2 & 0xf) << 4) | (c3 >> 2); if (cr && ch != '\n') @@ -280,7 +261,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) if (buf[3] == '=') break; - c4 = base64val (buf[3]); + c4 = base64val(buf[3]); ch = ((c3 & 0x3) << 6) | c4; if (cr && ch != '\n') @@ -327,14 +308,14 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd) if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL) return; len -= m_strlen(tmps); - if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5])) + if ((!m_strncmp(tmps, "begin", 5)) && ISSPACE (tmps[5])) break; } while (len > 0) { if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL) return; len -= m_strlen(tmps); - if (!str_ncmp (tmps, "end", 3)) + if (!m_strncmp(tmps, "end", 3)) break; pt = tmps; linelen = decode_byte (*pt); @@ -678,7 +659,7 @@ int text_enriched_handler (BODY * a, STATE * s) int tag_len = 0; char tag[LONG_STRING + 1]; - memset (&stte, 0, sizeof (stte)); + p_clear(&stte, 1); stte.s = s; stte.WrapMargin = ((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) < @@ -988,11 +969,9 @@ int mutt_can_decode (BODY * a) else if (a->type == TYPEMULTIPART) { BODY *p; - if (WithCrypto) { - if (ascii_strcasecmp (a->subtype, "signed") == 0 || - ascii_strcasecmp (a->subtype, "encrypted") == 0) - return (1); - } + if (ascii_strcasecmp (a->subtype, "signed") == 0 || + ascii_strcasecmp (a->subtype, "encrypted") == 0) + return (1); for (p = a->parts; p; p = p->next) { if (mutt_can_decode (p)) @@ -1000,10 +979,10 @@ int mutt_can_decode (BODY * a) } } - else if (WithCrypto && a->type == TYPEAPPLICATION) { - if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (a)) + else if (a->type == TYPEAPPLICATION) { + if (mutt_is_application_pgp(a)) return (1); - if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (a)) + if (mutt_is_application_smime (a)) return (1); } @@ -1103,7 +1082,7 @@ static int autoview_handler (BODY * a, STATE * s) p_delete(&fname); if (entry->command) { - strfcpy (command, entry->command, sizeof (command)); + m_strcpy(command, sizeof(command), entry->command); /* rfc1524_expand_command returns 0 if the file is required */ piped = @@ -1305,24 +1284,20 @@ void mutt_decode_attachment (BODY * b, STATE * s) fseeko (s->fpin, b->offset, 0); switch (b->encoding) { case ENCQUOTEDPRINTABLE: - mutt_decode_quoted (s, b->length, istext || - ((WithCrypto & APPLICATION_PGP) && - mutt_is_application_pgp (b)), cd); + mutt_decode_quoted(s, b->length, + istext || mutt_is_application_pgp(b), cd); break; case ENCBASE64: - mutt_decode_base64 (s, b->length, istext || - ((WithCrypto & APPLICATION_PGP) && - mutt_is_application_pgp (b)), cd); + mutt_decode_base64(s, b->length, + istext || mutt_is_application_pgp(b), cd); break; case ENCUUENCODED: - mutt_decode_uuencoded (s, b->length, istext - || ((WithCrypto & APPLICATION_PGP) && - mutt_is_application_pgp (b)), cd); + mutt_decode_uuencoded(s, b->length, + istext || mutt_is_application_pgp(b), cd); break; default: - mutt_decode_xbit (s, b->length, istext - || ((WithCrypto & APPLICATION_PGP) && - mutt_is_application_pgp (b)), cd); + mutt_decode_xbit(s, b->length, + istext || mutt_is_application_pgp(b), cd); break; } @@ -1361,7 +1336,7 @@ int mutt_body_handler (BODY * b, STATE * s) /* avoid copying this part twice since removing the transfer-encoding is * the only operation needed. */ - if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b)) + if (mutt_is_application_pgp (b)) handler = crypt_pgp_application_pgp_handler; else if (ascii_strcasecmp @@ -1388,7 +1363,7 @@ int mutt_body_handler (BODY * b, STATE * s) if (ascii_strcasecmp ("alternative", b->subtype) == 0) handler = alternative_handler; - else if (WithCrypto && ascii_strcasecmp ("signed", b->subtype) == 0) { + else if (ascii_strcasecmp ("signed", b->subtype) == 0) { p = mutt_get_parameter ("protocol", b->parameter); if (!p) @@ -1397,8 +1372,7 @@ int mutt_body_handler (BODY * b, STATE * s) else if (s->flags & M_VERIFY) handler = mutt_signed_handler; } - else if ((WithCrypto & APPLICATION_PGP) - && str_casecmp ("encrypted", b->subtype) == 0) { + else if (m_strcasecmp("encrypted", b->subtype) == 0) { p = mutt_get_parameter ("protocol", b->parameter); if (!p) @@ -1412,10 +1386,10 @@ int mutt_body_handler (BODY * b, STATE * s) if (!handler) handler = multipart_handler; } - else if (WithCrypto && b->type == TYPEAPPLICATION) { - if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b)) + else if (b->type == TYPEAPPLICATION) { + if (mutt_is_application_pgp (b)) handler = crypt_pgp_application_pgp_handler; - if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime (b)) + if (mutt_is_application_smime (b)) handler = crypt_smime_application_smime_handler; }