X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=06a1fcd8075a73a3b33b5c3fc67dd89d1342cc19;hp=2eb2dc10829ddb233d495668e61db37cb2230ef8;hb=c7ef4c04b0e95e263768e4df06220525a5872dca;hpb=5945a5016adb82ec9a29c9f7741cea269484e608 diff --git a/handler.c b/handler.c index 2eb2dc1..06a1fcd 100644 --- a/handler.c +++ b/handler.c @@ -19,8 +19,12 @@ #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" @@ -35,7 +39,7 @@ #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] = { @@ -661,7 +665,7 @@ static void enriched_set_flags (const char *tag, struct enriched_state *stte) } } -void text_enriched_handler (BODY * a, STATE * s) +int text_enriched_handler (BODY * a, STATE * s) { enum { TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE @@ -774,183 +778,15 @@ void text_enriched_handler (BODY * a, STATE * s) 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); */ -} - -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; @@ -958,6 +794,7 @@ static void alternative_handler (BODY * a, STATE * s) char buf[STRING]; int type = 0; int mustfree = 0; + int rc = 0; if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE || a->encoding == ENCUUENCODED) { @@ -1075,7 +912,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,23 +921,25 @@ 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); + + 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; + LOFF_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); @@ -1123,12 +962,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); + + return (rc); } /* returns 1 if decoding the attachment will produce output */ @@ -1168,12 +1009,13 @@ int mutt_can_decode (BODY * a) 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) { @@ -1207,7 +1049,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,19 +1063,21 @@ 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); + + return (rc); } -void autoview_handler (BODY * a, STATE * s) +static int autoview_handler (BODY * a, STATE * s) { rfc1524_entry *entry = rfc1524_new_entry (); char buffer[LONG_STRING]; @@ -1246,6 +1090,7 @@ 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); @@ -1272,7 +1117,7 @@ void autoview_handler (BODY * a, STATE * s) if ((fpin = safe_fopen (tempfile, "w+")) == NULL) { mutt_perror ("fopen"); rfc1524_free_entry (&entry); - return; + return (-1); } mutt_copy_bytes (s->fpin, fpin, a->length); @@ -1296,6 +1141,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; } @@ -1347,9 +1193,10 @@ void autoview_handler (BODY * a, STATE * s) mutt_clear_error (); } rfc1524_free_entry (&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; @@ -1359,11 +1206,9 @@ static void external_body_handler (BODY * b, STATE * s) 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); @@ -1397,7 +1242,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,7 +1255,7 @@ 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); } @@ -1426,11 +1271,12 @@ 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) @@ -1455,19 +1301,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; } @@ -1475,7 +1329,7 @@ void mutt_decode_attachment (BODY * b, STATE * s) 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; @@ -1485,6 +1339,7 @@ void mutt_body_handler (BODY * b, STATE * s) long tmpoffset = 0; size_t tmplength = 0; char type[STRING]; + int rc = 0; int oflags = s->flags; @@ -1510,7 +1365,7 @@ void mutt_body_handler (BODY * b, STATE * s) else if (ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0) - handler = text_plain_flowed_handler; + handler = rfc3676_handler; else plaintext = 1; } @@ -1565,7 +1420,7 @@ void 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 @@ -1605,7 +1460,7 @@ void 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); @@ -1624,7 +1479,7 @@ 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; @@ -1653,4 +1508,6 @@ void mutt_body_handler (BODY * b, STATE * s) bail: s->flags = oflags | (s->flags & M_FIRSTDONE); + + return (rc); }