X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=c72ddfccb38147e2ef907ce002603735eb2a2fb2;hp=9ab5231b44bd4cbf4fa4cccb33004c3750f98c4d;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=108f3c7ab59844591f7540347914ea57be5245e2 diff --git a/handler.c b/handler.c index 9ab5231..c72ddfc 100644 --- a/handler.c +++ b/handler.c @@ -7,33 +7,18 @@ * 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 +#include #include +#include #include +#include + #include "mutt.h" #include "recvattach.h" #include "handler.h" -#include "rfc1524.h" -#include "rfc3676.h" #include "keymap.h" #include "copy.h" #include "charset.h" @@ -50,7 +35,7 @@ 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); @@ -97,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; @@ -154,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 */ @@ -211,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; @@ -226,7 +211,6 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) buf[i++] = ch; } if (i != 4) { - debug_print (2, ("didn't get a multiple of 4 chars.\n")); break; } @@ -273,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); } @@ -286,20 +270,20 @@ 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 (char ch) { if (ch == 96) return 0; return 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 linelen, c, l, out; char *pt; char bufi[BUFI_SIZE]; - size_t k = 0; + ssize_t k = 0; if (istext) state_set_prefix (s); @@ -378,15 +362,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; @@ -400,7 +384,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'; @@ -415,7 +399,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]; @@ -499,7 +483,7 @@ static void enriched_flush (struct enriched_state *stte, int wrap) stte->line_max = stte->line_used; 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; @@ -647,7 +631,7 @@ static void enriched_set_flags (const char *tag, struct enriched_state *stte) } } -int 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 @@ -784,14 +768,12 @@ static int 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; @@ -842,12 +824,12 @@ static int 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; } @@ -908,7 +890,7 @@ static int alternative_handler (BODY * a, STATE * s) } if (mustfree) - mutt_free_body (&a); + body_list_wipe(&a); return (rc); } @@ -925,7 +907,7 @@ static int message_handler (BODY * a, STATE * s) 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); } @@ -949,7 +931,7 @@ static int message_handler (BODY * a, STATE * s) if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) - mutt_free_body (&b); + body_list_wipe(&b); return (rc); } @@ -1000,14 +982,12 @@ static int multipart_handler (BODY * a, STATE * s) 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; @@ -1052,14 +1032,14 @@ static int multipart_handler (BODY * a, STATE * s) if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) - mutt_free_body (&b); + body_list_wipe(&b); return (rc); } 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]; @@ -1096,14 +1076,14 @@ static int autoview_handler (BODY * a, STATE * s) if ((fpin = safe_fopen (tempfile, "w+")) == NULL) { mutt_perror ("fopen"); - rfc1524_free_entry (&entry); + 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 { @@ -1160,19 +1140,19 @@ static int 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); } @@ -1182,7 +1162,7 @@ static int external_body_handler (BODY * b, STATE * s) 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); @@ -1191,7 +1171,7 @@ static int external_body_handler (BODY * b, STATE * s) return (-1); } - expiration = mutt_get_parameter ("expiration", b->parameter); + expiration = parameter_getval(b->parameter, "expiration"); if (expiration) expire = mutt_parse_date (expiration, NULL); else @@ -1205,7 +1185,7 @@ static int 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)); @@ -1262,20 +1242,19 @@ static int external_body_handler (BODY * b, STATE * s) 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) { - const 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); } @@ -1301,7 +1280,7 @@ void mutt_decode_attachment (BODY * b, STATE * s) break; } - if (cd != (iconv_t) (-1)) + if (cd != MUTT_ICONV_ERROR) iconv_close (cd); } @@ -1313,7 +1292,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; @@ -1323,13 +1302,13 @@ int 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) { @@ -1339,9 +1318,8 @@ int mutt_body_handler (BODY * b, STATE * s) 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 = rfc3676_handler; + if (!ascii_strcasecmp("flowed", parameter_getval(b->parameter, "format"))) + handler = rfc3676_handler; else plaintext = 1; } @@ -1364,7 +1342,7 @@ int mutt_body_handler (BODY * b, STATE * s) if (ascii_strcasecmp ("alternative", b->subtype) == 0) handler = alternative_handler; else if (ascii_strcasecmp ("signed", b->subtype) == 0) { - p = mutt_get_parameter ("protocol", b->parameter); + p = parameter_getval(b->parameter, "protocol"); if (!p) mutt_error (_("Error: multipart/signed has no protocol.")); @@ -1373,7 +1351,7 @@ int mutt_body_handler (BODY * b, STATE * s) handler = mutt_signed_handler; } else if (m_strcasecmp("encrypted", b->subtype) == 0) { - p = mutt_get_parameter ("protocol", b->parameter); + p = parameter_getval(b->parameter, "protocol"); if (!p) mutt_error (_ @@ -1409,10 +1387,9 @@ int mutt_body_handler (BODY * b, STATE * s) 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 @@ -1428,16 +1405,16 @@ int 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 = 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; @@ -1461,7 +1438,7 @@ int mutt_body_handler (BODY * b, STATE * s) b->offset = tmpoffset; /* restore the original source stream */ - fclose (s->fpin); + m_fclose(&s->fpin); s->fpin = fp; } }