X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=ab47a382718b0d2d394eb517a4d4b20d3068ccaa;hp=a2481ace792a89c39ea88c8141930986b2001760;hb=56025510c87ad388a257fcbd8b369b0edcf97c34;hpb=617e7d83d14e14e6a520a48e75437211b16c8834 diff --git a/handler.c b/handler.c index a2481ac..ab47a38 100644 --- a/handler.c +++ b/handler.c @@ -19,57 +19,38 @@ #include #include +#include +#include +#include +#include +#include + +#include + +#include #include "mutt.h" -#include "ascii.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" -#include "lib/intl.h" -#include "lib/str.h" -#include "lib/debug.h" 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]; - size_t l = 0; + ssize_t l = 0; if (istext) { state_set_prefix (s); @@ -116,7 +97,7 @@ static int qp_decode_triple (char *s, char *d) return -1; } -static void qp_decode_line (char *dest, char *src, size_t * l, int last) +static void qp_decode_line (char *dest, char *src, ssize_t * l, int last) { char *d, *s; char c; @@ -177,9 +158,9 @@ void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd) { char line[STRING]; char decline[2 * STRING]; - size_t l = 0; - size_t linelen; /* number of input bytes in `line' */ - size_t l3; + ssize_t l = 0; + ssize_t linelen; /* number of input bytes in `line' */ + ssize_t l3; int last; /* store the last character in the input line */ @@ -199,7 +180,7 @@ void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd) if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL) break; - linelen = str_len (line); + linelen = m_strlen(line); len -= linelen; /* @@ -230,7 +211,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) char buf[5]; int c1, c2, c3, c4, ch, cr = 0, i; char bufi[BUFI_SIZE]; - size_t l = 0; + ssize_t l = 0; buf[4] = 0; @@ -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') @@ -318,7 +299,7 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd) char linelen, c, l, out; char *pt; char bufi[BUFI_SIZE]; - size_t k = 0; + ssize_t k = 0; if (istext) state_set_prefix (s); @@ -326,15 +307,15 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd) while (len > 0) { if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL) return; - len -= str_len (tmps); - if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5])) + len -= m_strlen(tmps); + if ((!m_strncmp(tmps, "begin", 5)) && ISSPACE (tmps[5])) break; } while (len > 0) { if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL) return; - len -= str_len (tmps); - if (!str_ncmp (tmps, "end", 3)) + len -= m_strlen(tmps); + if (!m_strncmp(tmps, "end", 3)) break; pt = tmps; linelen = decode_byte (*pt); @@ -397,15 +378,15 @@ struct enriched_state { char *buffer; char *line; char *param; - size_t buff_len; - size_t line_len; - size_t line_used; - size_t line_max; - size_t indent_len; - size_t word_len; - size_t buff_used; - size_t param_used; - size_t param_len; + ssize_t buff_len; + ssize_t line_len; + ssize_t line_used; + ssize_t line_max; + ssize_t indent_len; + ssize_t word_len; + ssize_t buff_used; + ssize_t param_used; + ssize_t param_len; int tag_level[RICH_LAST_TAG]; int WrapMargin; STATE *s; @@ -419,7 +400,7 @@ static void enriched_wrap (struct enriched_state *stte) if (stte->line_len) { if (stte->tag_level[RICH_CENTER] || stte->tag_level[RICH_FLUSHRIGHT]) { /* Strip trailing white space */ - size_t y = stte->line_used - 1; + ssize_t y = stte->line_used - 1; while (y && ISSPACE (stte->line[y])) { stte->line[y] = '\0'; @@ -434,7 +415,7 @@ static void enriched_wrap (struct enriched_state *stte) while (stte->line[y] && ISSPACE (stte->line[y])) y++; if (y) { - size_t z; + ssize_t z; for (z = y; z <= stte->line_used; z++) { stte->line[z - y] = stte->line[z]; @@ -474,7 +455,7 @@ static void enriched_wrap (struct enriched_state *stte) stte->indent_len = 0; if (stte->s->prefix) { state_puts (stte->s->prefix, stte->s); - stte->indent_len += str_len (stte->s->prefix); + stte->indent_len += m_strlen(stte->s->prefix); } if (stte->tag_level[RICH_EXCERPT]) { @@ -482,11 +463,11 @@ static void enriched_wrap (struct enriched_state *stte) while (x) { if (stte->s->prefix) { state_puts (stte->s->prefix, stte->s); - stte->indent_len += str_len (stte->s->prefix); + stte->indent_len += m_strlen(stte->s->prefix); } else { state_puts ("> ", stte->s); - stte->indent_len += str_len ("> "); + stte->indent_len += m_strlen("> "); } x--; } @@ -588,7 +569,7 @@ static void enriched_puts (const char *s, struct enriched_state *stte) { const char *p; - if (stte->buff_len < stte->buff_used + str_len (s)) { + if (stte->buff_len < stte->buff_used + m_strlen(s)) { stte->buff_len += LONG_STRING; p_realloc(&stte->buffer, stte->buff_len + 1); } @@ -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) < @@ -692,7 +673,7 @@ int text_enriched_handler (BODY * a, STATE * s) if (s->prefix) { state_puts (s->prefix, s); - stte.indent_len += str_len (s->prefix); + stte.indent_len += m_strlen(s->prefix); } while (state != DONE) { @@ -791,7 +772,7 @@ static int alternative_handler (BODY * a, STATE * s) { BODY *choice = NULL; BODY *b; - LIST *t; + string_list_t *t; char buf[STRING]; int type = 0; int mustfree = 0; @@ -831,7 +812,7 @@ static int alternative_handler (BODY * a, STATE * s) } else { wild = 1; - btlen = str_len (t->data); + btlen = m_strlen(t->data); } if (a && a->parts) @@ -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); } @@ -1096,14 +1075,14 @@ static int autoview_handler (BODY * a, STATE * s) snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype); rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW); - fname = str_dup (a->filename); + fname = m_strdup(a->filename); mutt_sanitize_filename (fname, 1); rfc1524_expand_filename (entry->nametemplate, fname, tempfile, sizeof (tempfile)); 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; } @@ -1338,7 +1313,7 @@ int mutt_body_handler (BODY * b, STATE * s) char tempfile[_POSIX_PATH_MAX]; handler_t handler = NULL; long tmpoffset = 0; - size_t tmplength = 0; + ssize_t tmplength = 0; char type[STRING]; int rc = 0; @@ -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; }