X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=27bfb08ba53f13b3cd89c7e92ec7e232f60a45ed;hp=2eb2dc10829ddb233d495668e61db37cb2230ef8;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=5945a5016adb82ec9a29c9f7741cea269484e608 diff --git a/handler.c b/handler.c index 2eb2dc1..27bfb08 100644 --- a/handler.c +++ b/handler.c @@ -7,64 +7,35 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include -#include -#include -#include -#include -#include +#include +#include + +#include + +#include #include "mutt.h" -#include "mutt_curses.h" -#include "rfc1524.h" +#include "recvattach.h" +#include "handler.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/mem.h" -#include "lib/intl.h" -#include "lib/str.h" -#include "lib/debug.h" -typedef void handler_f (BODY *, STATE *); +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); @@ -111,7 +82,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; @@ -168,13 +139,13 @@ static void qp_decode_line (char *dest, char *src, size_t * l, int last) * */ -void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd) +static 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 */ @@ -194,7 +165,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; /* @@ -225,7 +196,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; @@ -236,16 +207,15 @@ 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) { - debug_print (2, ("didn't get a multiple of 4 chars.\n")); 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') @@ -260,7 +230,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') @@ -275,7 +245,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') @@ -287,7 +257,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); } @@ -300,20 +270,18 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) state_reset_prefix (s); } -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; } -void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd) +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]; - size_t k = 0; + ssize_t k = 0; if (istext) state_set_prefix (s); @@ -321,24 +289,24 @@ 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); + 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) @@ -370,37 +338,36 @@ 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 { 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; @@ -414,7 +381,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'; @@ -429,7 +396,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]; @@ -469,7 +436,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]) { @@ -477,11 +444,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--; } @@ -511,9 +478,9 @@ 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__ */ + m_strcat(stte->line, stte->line_max + 1, stte->buffer); stte->line_len += stte->word_len; stte->word_len = 0; stte->buff_used = 0; @@ -528,7 +495,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; } @@ -538,7 +505,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') { @@ -571,26 +538,25 @@ 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++; } } -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++; } } @@ -661,7 +627,7 @@ static void enriched_set_flags (const char *tag, struct enriched_state *stte) } } -void text_enriched_handler (BODY * a, STATE * s) +static int text_enriched_handler (BODY * a, STATE * s) { enum { TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE @@ -673,21 +639,21 @@ void 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) { @@ -771,193 +737,26 @@ void 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)); -} - -/* - * An implementation of RFC 2646. - * - * NOTE: This still has to be made UTF-8 aware. - * - */ - -#define FLOWED_MAX 77 - -static int get_quote_level (char *line) -{ - int quoted; - - for (quoted = 0; line[quoted] == '>'; quoted++); - return quoted; -} - -static void print_flowed_line (char *line, STATE * s, int ql) -{ - int width; - char *pos, *oldpos; - int len = str_len (line); - int i; - - if (MaxLineLength > 0) { - width = MaxLineLength - WrapMargin - ql - 1; - if (option (OPTSTUFFQUOTED)) - --width; - if (width < 0) - width = MaxLineLength; - } - else { - if (option (OPTMBOXPANE)) - width = COLS - SidebarWidth - WrapMargin - ql - 1; - else - width = COLS - WrapMargin - ql - 1; - - if (option (OPTSTUFFQUOTED)) - --width; - if (width < 0) - width = COLS; - } - - /* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */ - - if (str_len (line) == 0) { - if (option (OPTQUOTEEMPTY)) { - if (s->prefix) - state_puts(s->prefix,s); - for (i=0;i',s); - if (option(OPTSTUFFQUOTED)) - state_putc(' ',s); - } - state_putc('\n',s); - return; - } - - pos = line + ql + width; - oldpos = line + ql; - if (ql > 0 && ISBLANK (*oldpos)) - ++oldpos; - - /* fprintf(stderr,"oldpos = %p line+len = %p\n",oldpos,line+len); */ - - for (; oldpos < line + len; pos += width) { - /* fprintf(stderr,"outer for loop\n"); */ - if (pos < line + len) { /* only search a new position when we're not over the end of the string w/ pos */ - /* fprintf(stderr,"if 1\n"); */ - if (*pos == ' ') { - /* fprintf(stderr,"if 2: good luck! found a space\n"); */ - *pos = '\0'; - ++pos; - } - else { - /* fprintf(stderr,"if 2: else\n"); */ - char *save = pos; - - while (pos >= oldpos && !isspace (*pos)) { - /* fprintf(stderr,"pos(%p) > oldpos(%p)\n",pos,oldpos); */ - --pos; - } - if (pos < oldpos) { - /* fprintf(stderr,"wow, no space found, searching the other direction\n"); */ - pos = save; - while (pos < line + len && *pos && !isspace (*pos)) { - /* fprintf(stderr,"pos(%p) < line+len(%p)\n",pos,line+len); */ - ++pos; - } - /* fprintf(stderr,"found a space pos = %p\n",pos); */ - } - *pos = '\0'; - ++pos; - } - } - else { - /* fprintf(stderr,"if 1 else\n"); */ - } - if (s->prefix) - state_puts (s->prefix, s); - for (i = 0; i < ql; ++i) - state_putc ('>', s); - if (option (OPTSTUFFQUOTED) && (ql > 0 || s->prefix)) - state_putc (' ', s); - state_puts (oldpos, s); - /* fprintf(stderr,"print_flowed_line: `%s'\n",oldpos); */ - if (pos < line + len) - state_putc (' ', s); - state_putc ('\n', s); - oldpos = pos; - } - /*state_puts(line,s); - state_putc('\n',s); */ -} + p_delete(&(stte.buffer)); + p_delete(&(stte.line)); + p_delete(&(stte.param)); -static void text_plain_flowed_handler (BODY * a, STATE * s) -{ - int bytes = a->length; - char buf[LONG_STRING]; - char *curline = strdup (""); - char *t = NULL; - unsigned int curline_len = 1; - unsigned int quotelevel = 0, newql = 0; - int first_line = 1; - - while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) { - - bytes -= str_len (buf); - - newql = get_quote_level (buf); - - if (bytes == 0 || ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r')))) { - if (t) - *t = '\0'; - if (str_len (curline) > 0 && curline[str_len (curline) - 1] == ' ' - && newql == quotelevel - && strcmp (curline + quotelevel, "-- ") != 0) { - if (buf[newql] == ' ') - curline[str_len (curline) - 1] = '\0'; - - curline = realloc (curline, curline_len + str_len (buf)); - if (curline_len == 1) - *curline = '\0'; - curline_len += str_len (buf); - str_ncat (curline, curline_len, buf + newql, - str_len (buf + newql)); - } - else { - if (first_line) { - first_line = 0; - } - else { - print_flowed_line (curline, s, quotelevel); - } - mem_free (&curline); - curline_len = 1; - curline = realloc (curline, curline_len + str_len (buf)); - if (curline_len == 1) - *curline = '\0'; - curline_len += str_len (buf); - str_ncat (curline, curline_len, buf, str_len (buf)); - quotelevel = newql; - } - } - } - if (curline) { - print_flowed_line (curline, s, quotelevel); - mem_free (&curline); - } + return (0); } #define TXTHTML 1 #define TXTPLAIN 2 #define TXTENRICHED 3 -static void alternative_handler (BODY * a, STATE * s) +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; + int rc = 0; if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) { @@ -965,14 +764,12 @@ static void 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; @@ -993,7 +790,7 @@ static void alternative_handler (BODY * a, STATE * s) } else { wild = 1; - btlen = str_len (t->data); + btlen = m_strlen(t->data); } if (a && a->parts) @@ -1023,12 +820,12 @@ static void alternative_handler (BODY * a, STATE * s) while (b) { snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype); if (mutt_is_autoview (b, buf)) { - rfc1524_entry *entry = rfc1524_new_entry (); + rfc1524_entry *entry = rfc1524_entry_new(); if (rfc1524_mailcap_lookup (b, buf, entry, M_AUTOVIEW)) { choice = b; } - rfc1524_free_entry (&entry); + rfc1524_entry_delete(&entry); } b = b->next; } @@ -1075,7 +872,7 @@ static void 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); } @@ -1084,27 +881,29 @@ static void alternative_handler (BODY * a, STATE * s) else if (s->flags & M_DISPLAY) { /* didn't find anything that we could display! */ state_mark_attach (s); - state_puts (_ - ("[-- Error: Could not display any parts of Multipart/Alternative! --]\n"), - s); + state_puts (_("[-- Error: Could not display any parts of Multipart/Alternative! --]\n"), s); + rc = -1; } if (mustfree) - mutt_free_body (&a); + body_list_wipe(&a); + + return (rc); } /* handles message/rfc822 body parts */ -void message_handler (BODY * a, STATE * s) +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); - b = mutt_new_body (); + b = body_new(); b->length = (long) st.st_size; b->parts = mutt_parse_messageRFC822 (s->fpin, b); } @@ -1123,12 +922,14 @@ void message_handler (BODY * a, STATE * s) state_puts (s->prefix, s); state_putc ('\n', s); - mutt_body_handler (b->parts, s); + rc = mutt_body_handler (b->parts, s); } if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) - mutt_free_body (&b); + body_list_wipe(&b); + + return (rc); } /* returns 1 if decoding the attachment will produce output */ @@ -1146,11 +947,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)) @@ -1158,34 +957,33 @@ 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); } return (0); } -void multipart_handler (BODY * a, STATE * s) +static int multipart_handler (BODY * a, STATE * s) { BODY *b, *p; char length[5]; struct stat st; int count; + int rc = 0; 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; @@ -1207,7 +1005,7 @@ void 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 @@ -1221,21 +1019,23 @@ void multipart_handler (BODY * a, STATE * s) state_printf (s, "%s: \n", p->form_name); } - mutt_body_handler (p, s); + rc = mutt_body_handler (p, s); state_putc ('\n', s); - if ((s->flags & M_REPLYING) - && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)) + if (rc || ((s->flags & M_REPLYING) + && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE))) break; } if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) - mutt_free_body (&b); + body_list_wipe(&b); + + return (rc); } -void autoview_handler (BODY * a, STATE * s) +static int autoview_handler (BODY * a, STATE * s) { - rfc1524_entry *entry = rfc1524_new_entry (); + rfc1524_entry *entry = rfc1524_entry_new(); char buffer[LONG_STRING]; char type[STRING]; char command[LONG_STRING]; @@ -1246,18 +1046,19 @@ void autoview_handler (BODY * a, STATE * s) FILE *fperr = NULL; int piped = FALSE; pid_t thepid; + int rc = 0; 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 = @@ -1271,17 +1072,16 @@ void autoview_handler (BODY * a, STATE * s) if ((fpin = safe_fopen (tempfile, "w+")) == NULL) { mutt_perror ("fopen"); - rfc1524_free_entry (&entry); - return; + rfc1524_entry_delete(&entry); + return (-1); } mutt_copy_bytes (s->fpin, fpin, a->length); if (!piped) { - safe_fclose (&fpin); + m_fclose(&fpin); thepid = mutt_create_filter (command, NULL, &fpout, &fperr); - } - else { + } else { unlink (tempfile); fflush (fpin); rewind (fpin); @@ -1296,6 +1096,7 @@ void autoview_handler (BODY * a, STATE * s) state_mark_attach (s); state_printf (s, _("[-- Can't run %s. --]\n"), command); } + rc = -1; goto bail; } @@ -1318,8 +1119,7 @@ void 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)) { @@ -1334,39 +1134,38 @@ void autoview_handler (BODY * a, STATE * s) } bail: - safe_fclose (&fpout); - safe_fclose (&fperr); + m_fclose(&fpout); + m_fclose(&fperr); mutt_wait_filter (thepid); if (piped) - safe_fclose (&fpin); + m_fclose(&fpin); else mutt_unlink (tempfile); if (s->flags & M_DISPLAY) mutt_clear_error (); } - rfc1524_free_entry (&entry); + rfc1524_entry_delete(&entry); + return (rc); } -static void external_body_handler (BODY * b, STATE * s) +static int external_body_handler (BODY * b, STATE * s) { const char *access_type; 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); - state_puts (_ - ("[-- Error: message/external-body has no access-type parameter --]\n"), - s); + state_puts (_("[-- Error: message/external-body has no access-type parameter --]\n"), s); } - return; + return (-1); } - expiration = mutt_get_parameter ("expiration", b->parameter); + expiration = parameter_getval(b->parameter, "expiration"); if (expiration) expire = mutt_parse_date (expiration, NULL); else @@ -1380,7 +1179,7 @@ static void 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)); @@ -1397,7 +1196,7 @@ static void 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); } @@ -1410,12 +1209,11 @@ static void 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); } - } - else { + } else { if (s->flags & M_DISPLAY) { state_mark_attach (s); state_printf (s, @@ -1426,56 +1224,60 @@ static void 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); } } + return (0); } 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) { - 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); + if (!charset) + charset = charset_getfirst(AssumedCharset); if (charset && Charset) cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM); - } - else { + } else { if (b->file_charset) cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM); } } - 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 || mutt_is_application_pgp(b), cd); break; case ENCBASE64: - mutt_decode_base64 (s, b->length, istext, cd); + mutt_decode_base64(s, b->length, + istext || mutt_is_application_pgp(b), cd); break; case ENCUUENCODED: - mutt_decode_uuencoded (s, b->length, istext, cd); + mutt_decode_uuencoded(s, b->length, + istext || mutt_is_application_pgp(b), cd); break; default: - mutt_decode_xbit (s, b->length, istext, cd); + mutt_decode_xbit(s, b->length, + istext || mutt_is_application_pgp(b), cd); break; } - if (cd != (iconv_t) (-1)) + if (cd != MUTT_ICONV_ERROR) iconv_close (cd); } -void mutt_body_handler (BODY * b, STATE * s) +int mutt_body_handler (BODY * b, STATE * s) { int decode = 0; int plaintext = 0; @@ -1483,8 +1285,9 @@ void 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; int oflags = s->flags; @@ -1492,25 +1295,24 @@ void mutt_body_handler (BODY * b, STATE * s) snprintf (type, sizeof (type), "%s/%s", TYPE (b), b->subtype); if (mutt_is_autoview (b, type)) { - rfc1524_entry *entry = rfc1524_new_entry (); + rfc1524_entry *entry = rfc1524_entry_new(); if (rfc1524_mailcap_lookup (b, type, entry, M_AUTOVIEW)) { handler = autoview_handler; s->flags &= ~M_CHARCONV; } - rfc1524_free_entry (&entry); + rfc1524_entry_delete(&entry); } else if (b->type == TYPETEXT) { if (ascii_strcasecmp ("plain", b->subtype) == 0) { /* 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 - ("flowed", mutt_get_parameter ("format", b->parameter)) == 0) - handler = text_plain_flowed_handler; + if (!ascii_strcasecmp("flowed", parameter_getval(b->parameter, "format"))) + handler = rfc3676_handler; else plaintext = 1; } @@ -1520,7 +1322,7 @@ void mutt_body_handler (BODY * b, STATE * s) plaintext = 1; } else if (b->type == TYPEMESSAGE) { - if (mutt_is_message_type (b->type, b->subtype)) + if (mutt_is_message_type (b)) handler = message_handler; else if (!ascii_strcasecmp ("delivery-status", b->subtype)) plaintext = 1; @@ -1532,8 +1334,8 @@ void 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) { - p = mutt_get_parameter ("protocol", b->parameter); + else if (ascii_strcasecmp ("signed", b->subtype) == 0) { + p = parameter_getval(b->parameter, "protocol"); if (!p) mutt_error (_("Error: multipart/signed has no protocol.")); @@ -1541,9 +1343,8 @@ void 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) { - p = mutt_get_parameter ("protocol", b->parameter); + else if (m_strcasecmp("encrypted", b->subtype) == 0) { + p = parameter_getval(b->parameter, "protocol"); if (!p) mutt_error (_ @@ -1556,33 +1357,31 @@ void 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; } 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 - * 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; - mutt_mktemp (tempfile); - if ((s->fpout = safe_fopen (tempfile, "w")) == NULL) { + s->fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL); + if (!s->fpout) { mutt_error _("Unable to open temporary file!"); - goto bail; } /* decoding the attachment changes the size and offset, so save a copy @@ -1598,16 +1397,16 @@ void mutt_body_handler (BODY * b, STATE * s) s->prefix = NULL; decode = 1; - } - else + } else { b->type = TYPETEXT; + } mutt_decode_attachment (b, s); if (decode) { - b->length = ftell (s->fpout); + b->length = ftello (s->fpout); b->offset = 0; - fclose (s->fpout); + m_fclose(&s->fpout); /* restore final destination and substitute the tempfile for input */ s->fpout = fp; @@ -1624,14 +1423,14 @@ void mutt_body_handler (BODY * b, STATE * s) /* process the (decoded) body part */ if (handler) { - handler (b, s); + rc = handler (b, s); if (decode) { b->length = tmplength; b->offset = tmpoffset; /* restore the original source stream */ - fclose (s->fpin); + m_fclose(&s->fpin); s->fpin = fp; } } @@ -1653,4 +1452,6 @@ void mutt_body_handler (BODY * b, STATE * s) bail: s->flags = oflags | (s->flags & M_FIRSTDONE); + + return (rc); }