X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=3a9dd146a4f2913a95e4b01ffda732d1e240245a;hp=6d4857bfa011ef71a11de8662b28f7654b9d0d4f;hb=df5b14084b39821395408679a2fb6f74605182ce;hpb=fa54675b6ceb98bce1a8931b7cc5b70ecedf4225 diff --git a/handler.c b/handler.c index 6d4857b..3a9dd14 100644 --- a/handler.c +++ b/handler.c @@ -18,15 +18,21 @@ #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" @@ -34,37 +40,12 @@ #include "attach.h" #include "lib.h" -#include "lib/mem.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]; @@ -198,7 +179,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; /* @@ -240,7 +221,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) { @@ -248,8 +229,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') @@ -264,7 +245,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') @@ -279,7 +260,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') @@ -325,15 +306,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); @@ -473,7 +454,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]) { @@ -481,11 +462,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--; } @@ -515,7 +496,7 @@ static void enriched_flush (struct enriched_state *stte, int wrap) stte->line_used += stte->buff_used; if (stte->line_used > stte->line_max) { stte->line_max = stte->line_used; - mem_realloc (&stte->line, stte->line_max + 1); + p_realloc(&stte->line, stte->line_max + 1); } strcat (stte->line, stte->buffer); /* __STRCAT_CHECKED__ */ stte->line_len += stte->word_len; @@ -532,7 +513,7 @@ static void enriched_putc (int c, struct enriched_state *stte) if (stte->tag_level[RICH_PARAM]) { if (stte->tag_level[RICH_COLOR]) { if (stte->param_used + 1 >= stte->param_len) - mem_realloc (&stte->param, (stte->param_len += STRING)); + p_realloc(&stte->param, (stte->param_len += STRING)); stte->param[stte->param_used++] = c; } @@ -542,7 +523,7 @@ static void enriched_putc (int c, struct enriched_state *stte) /* see if more space is needed (plus extra for possible rich characters) */ if (stte->buff_len < stte->buff_used + 3) { stte->buff_len += LONG_STRING; - mem_realloc (&stte->buffer, stte->buff_len + 1); + p_realloc(&stte->buffer, stte->buff_len + 1); } if ((!stte->tag_level[RICH_NOFILL] && ISSPACE (c)) || c == '\0') { @@ -583,18 +564,18 @@ static void enriched_putc (int c, struct enriched_state *stte) } } -static void enriched_puts (char *s, struct enriched_state *stte) +static void enriched_puts (const char *s, struct enriched_state *stte) { - char *c; + 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; - mem_realloc (&stte->buffer, stte->buff_len + 1); + p_realloc(&stte->buffer, stte->buff_len + 1); } - c = s; - while (*c) { - stte->buffer[stte->buff_used++] = *c; - c++; + + p = s; + while (*p) { + stte->buffer[stte->buff_used++] = *p++; } } @@ -677,21 +658,21 @@ 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) < 72) ? (COLS - 4) : 72); stte.line_max = stte.WrapMargin * 4; - stte.line = (char *) mem_calloc (1, stte.line_max + 1); - stte.param = (char *) mem_calloc (1, STRING); + stte.line = p_new(char, stte.line_max + 1); + stte.param = p_new(char, STRING); stte.param_len = STRING; stte.param_used = 0; 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) { @@ -775,9 +756,9 @@ int text_enriched_handler (BODY * a, STATE * s) state_putc ('\n', s); /* add a final newline */ - mem_free (&(stte.buffer)); - mem_free (&(stte.line)); - mem_free (&(stte.param)); + p_delete(&(stte.buffer)); + p_delete(&(stte.line)); + p_delete(&(stte.param)); return (0); } @@ -830,7 +811,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) @@ -912,7 +893,7 @@ static int alternative_handler (BODY * a, STATE * s) if (choice) { if (s->flags & M_DISPLAY && !option (OPTWEED)) { - fseek (s->fpin, choice->hdr_offset, 0); + fseeko (s->fpin, choice->hdr_offset, 0); mutt_copy_bytes (s->fpin, s->fpout, choice->offset - choice->hdr_offset); } @@ -936,10 +917,10 @@ static int message_handler (BODY * a, STATE * s) { struct stat st; BODY *b; - long off_start; + off_t off_start; int rc = 0; - off_start = ftell (s->fpin); + off_start = ftello (s->fpin); if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) { fstat (fileno (s->fpin), &st); @@ -1049,7 +1030,7 @@ static int multipart_handler (BODY * a, STATE * s) state_printf (s, _("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"), TYPE (p), p->subtype, ENCODING (p->encoding), length); if (!option (OPTWEED)) { - fseek (s->fpin, p->hdr_offset, 0); + fseeko (s->fpin, p->hdr_offset, 0); mutt_copy_bytes (s->fpin, s->fpout, p->offset - p->hdr_offset); } else @@ -1095,14 +1076,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)); - mem_free (&fname); + 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 = @@ -1242,7 +1223,7 @@ static int external_body_handler (BODY * b, STATE * s) state_printf (s, _("[-- name: %s --]\n"), b->parts->filename); } - mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset, + mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset, (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE, NULL); } @@ -1255,7 +1236,7 @@ static int external_body_handler (BODY * b, STATE * s) state_attach_puts (_("[-- and the indicated external source has --]\n" "[-- expired. --]\n"), s); - mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset, + mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset, (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE, NULL); } @@ -1271,7 +1252,7 @@ static int external_body_handler (BODY * b, STATE * s) _ ("[-- and the indicated access-type %s is unsupported --]\n"), access_type); - mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset, + mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset, (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) | CH_DECODE, NULL); } @@ -1288,7 +1269,7 @@ void mutt_decode_attachment (BODY * b, STATE * s) if (istext) { if (s->flags & M_CHARCONV) { - char *charset = mutt_get_parameter ("charset", b->parameter); + const char *charset = mutt_get_parameter ("charset", b->parameter); if (!option (OPTSTRICTMIME) && !charset) charset = mutt_get_first_charset (AssumedCharset); @@ -1301,19 +1282,27 @@ void mutt_decode_attachment (BODY * b, STATE * s) } } - fseek (s->fpin, b->offset, 0); + fseeko (s->fpin, b->offset, 0); switch (b->encoding) { case ENCQUOTEDPRINTABLE: - mutt_decode_quoted (s, b->length, istext, cd); + mutt_decode_quoted (s, b->length, istext || + ((WithCrypto & APPLICATION_PGP) && + mutt_is_application_pgp (b)), cd); break; case ENCBASE64: - mutt_decode_base64 (s, b->length, istext, cd); + mutt_decode_base64 (s, b->length, istext || + ((WithCrypto & APPLICATION_PGP) && + mutt_is_application_pgp (b)), cd); break; case ENCUUENCODED: - mutt_decode_uuencoded (s, b->length, istext, cd); + mutt_decode_uuencoded (s, b->length, istext + || ((WithCrypto & APPLICATION_PGP) && + mutt_is_application_pgp (b)), cd); break; default: - mutt_decode_xbit (s, b->length, istext, cd); + mutt_decode_xbit (s, b->length, istext + || ((WithCrypto & APPLICATION_PGP) && + mutt_is_application_pgp (b)), cd); break; } @@ -1389,7 +1378,7 @@ int mutt_body_handler (BODY * b, STATE * s) handler = mutt_signed_handler; } else if ((WithCrypto & APPLICATION_PGP) - && str_casecmp ("encrypted", b->subtype) == 0) { + && m_strcasecmp("encrypted", b->subtype) == 0) { p = mutt_get_parameter ("protocol", b->parameter); if (!p) @@ -1412,7 +1401,7 @@ int mutt_body_handler (BODY * b, STATE * s) if (plaintext || handler) { - fseek (s->fpin, b->offset, 0); + 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 @@ -1452,7 +1441,7 @@ int mutt_body_handler (BODY * b, STATE * s) mutt_decode_attachment (b, s); if (decode) { - b->length = ftell (s->fpout); + b->length = ftello (s->fpout); b->offset = 0; fclose (s->fpout);