X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=74677fd7e3ef4056b68829dc05432337c93b28b4;hp=b5c3bda6b35c2d49a3accf9684c71eadf115075b;hb=afa60149c4d2bb71c8195091d3658b3bdc12d59d;hpb=74a2265af51ce89bca845adc1d68f273c9933c13 diff --git a/handler.c b/handler.c index b5c3bda..74677fd 100644 --- a/handler.c +++ b/handler.c @@ -31,6 +31,7 @@ #include "lib/mem.h" #include "lib/intl.h" #include "lib/str.h" +#include "lib/debug.h" #define BUFI_SIZE 1000 #define BUFO_SIZE 2000 @@ -287,8 +288,7 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd) buf[i++] = ch; } if (i != 4) { - dprint (2, (debugfile, "%s:%d [mutt_decode_base64()]: " - "didn't get a multiple of 4 chars.\n", __FILE__, __LINE__)); + debug_print (2, ("didn't get a multiple of 4 chars.\n")); break; } @@ -370,14 +370,14 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd) if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL) return; len -= mutt_strlen (tmps); - if ((!mutt_strncmp (tmps, "begin", 5)) && ISSPACE (tmps[5])) + if ((!safe_strncmp (tmps, "begin", 5)) && ISSPACE (tmps[5])) break; } while (len > 0) { if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL) return; len -= mutt_strlen (tmps); - if (!mutt_strncmp (tmps, "end", 3)) + if (!safe_strncmp (tmps, "end", 3)) break; pt = tmps; linelen = decode_byte (*pt); @@ -833,287 +833,6 @@ void text_enriched_handler (BODY * a, STATE * s) #define FLOWED_MAX 77 -#if 0 -static int flowed_maybe_quoted (char *cont) -{ - return regexec ((regex_t *) QuoteRegexp.rx, cont, 0, NULL, 0) == 0; -} - -static void flowed_quote (STATE * s, int level) -{ - int i; - - if (s->prefix) { - if (option (OPTTEXTFLOWED)) - level++; - else - state_puts (s->prefix, s); - } - - for (i = 0; i < level; i++) - state_putc ('>', s); -} - -static void flowed_stuff (STATE * s, char *cont, int level) -{ - if (!option (OPTTEXTFLOWED) && !(s->flags & M_DISPLAY)) - return; - - if (s->flags & M_DISPLAY) { - /* - * Hack: If we are in the beginning of the line and there is - * some text on the line which looks like it's quoted, turn off - * ANSI colors, so quote coloring doesn't affect this line. - */ - if (*cont && !level && !mutt_strcmp (Pager, "builtin") - && flowed_maybe_quoted (cont)) - state_puts ("\033[0m", s); - } - else if ((!(s->flags & M_PRINTING)) && ((*cont == ' ') || (*cont == '>') - || (!level - && !mutt_strncmp (cont, "From ", - 5)))) - state_putc (' ', s); -} - -static char *flowed_skip_indent (char *prefix, char *cont) -{ - for (; *cont == ' ' || *cont == '\t'; cont++) - *prefix++ = *cont; - *prefix = '\0'; - return cont; -} - -static int flowed_visual_strlen (char *l, int i) -{ - int j; - - for (j = 0; *l; l++) { - if (*l == '\t') - j += 8 - ((i + j) % 8); - else - j++; - } - - return j; -} - -static void text_plain_flowed_handler (BODY * a, STATE * s) -{ - char line[LONG_STRING]; - char indent[LONG_STRING]; - - int quoted = -1; - int last_quoted; - int full = 1; - int last_full; - int col = 0, tmpcol; - - int i_add = 0; - int add = 0; - int soft = 0; - int l, rl; - - int flowed_max; - int bytes = a->length; - int actually_wrap = 0; - - char *cont = NULL; - char *tail = NULL; - char *lc = NULL; - char *t; - - *indent = '\0'; - - if (s->prefix) - add = 1; - - /* - if ((flowed_max = FLOWED_MAX) > COLS - 3) - flowed_max = COLS - 3; - if (flowed_max > COLS - WrapMargin) - flowed_max = COLS - WrapMargin; - if (flowed_max <= 0) - flowed_max = COLS; - */ - flowed_max = COLS - WrapMargin; - if (flowed_max <= 0) - flowed_max = COLS; - - fprintf (stderr, "flowed_max = %d\n", flowed_max); - - while (bytes > 0 && fgets (line, sizeof (line), s->fpin)) { - bytes -= mutt_strlen (line); - tail = NULL; - - last_full = full; - - /* - * If the last line wasn't fully read, this is the - * tail of some line. - */ - actually_wrap = !last_full; - - if ((t = strrchr (line, '\r')) || (t = strrchr (line, '\n'))) { - *t = '\0'; - full = 1; - } - else if ((t = strrchr (line, ' ')) || (t = strrchr (line, '\t'))) { - /* - * Bad: We have a line of more than LONG_STRING characters. - * (Which SHOULD NOT happen, since lines SHOULD be <= 79 - * characters long.) - * - * Try to simulate a soft line break at a word boundary. - * Handle the rest of the line next time. - * - * Give up when we have a single word which is longer than - * LONG_STRING characters. It will just be split into parts, - * with a hard line break in between. - */ - - full = 0; - l = mutt_strlen (t + 1); - t[0] = ' '; - t[1] = '\0'; - - if (l) { - fseek (s->fpin, -l, SEEK_CUR); - bytes += l; - } - } - else - full = 0; - - last_quoted = quoted; - - if (last_full) { - /* - * We are in the beginning of a new line. Determine quote level - * and indentation prefix - */ - for (quoted = 0; line[quoted] == '>'; quoted++); - - cont = line + quoted; - - /* undo space stuffing */ - if (*cont == ' ') - cont++; - - /* If there is an indentation, record it. */ - cont = flowed_skip_indent (indent, cont); - i_add = flowed_visual_strlen (indent, quoted + add); - } - else { - /* - * This is just the tail of some over-long line. Keep - * indentation and quote levels. Don't unstuff. - */ - cont = line; - } - - /* If we have a change in quoting depth, wrap. */ - - if (col && last_quoted != quoted && last_quoted >= 0) { - state_putc ('\n', s); - col = 0; - } - - do { - if (tail) - cont = tail; - - SKIPWS (cont); - - tail = NULL; - soft = 0; - - /* try to find a point for word wrapping */ - - retry_wrap: - l = flowed_visual_strlen (cont, quoted + i_add + add + col); - rl = mutt_strlen (cont); - if (quoted + i_add + add + col + l > flowed_max) { - actually_wrap = 1; - - for (tmpcol = quoted + i_add + add + col, t = cont; - *t && tmpcol < flowed_max; t++) { - if (*t == ' ' || *t == '\t') - tail = t; - if (*t == '\t') - tmpcol = (tmpcol & ~7) + 8; - else - tmpcol++; - } - - if (tail) { - *tail++ = '\0'; - soft = 2; - } - } - - /* We seem to be desperate. Get me a new line, and retry. */ - if (!tail && (quoted + add + col + i_add + l > flowed_max) && col) { - state_putc ('\n', s); - col = 0; - goto retry_wrap; - } - - /* Detect soft line breaks. */ - if (!soft && ascii_strcmp (cont, "-- ")) { - lc = strrchr (cont, ' '); - if (lc && lc[1] == '\0') - soft = 1; - } - - /* - * If we are in the beginning of an output line, do quoting - * and stuffing. - * - * We have to temporarily assemble the line since display - * stuffing (i.e., turning off quote coloring) may depend on - * the line's actual content. You never know what people put - * into their regular expressions. - */ - if (!col) { - char tmp[LONG_STRING]; - - snprintf (tmp, sizeof (tmp), "%s%s", indent, cont); - - flowed_quote (s, quoted); - flowed_stuff (s, tmp, quoted + add); - - state_puts (indent, s); - } - - /* output the text */ - state_puts (cont, s); - col += flowed_visual_strlen (cont, quoted + i_add + add + col); - - /* possibly indicate a soft line break */ - if (soft == 2) { - state_putc (' ', s); - col++; - } - - /* - * Wrap if this display line corresponds to a - * text line. Don't wrap if we changed the line. - */ - if (!soft || (!actually_wrap && full)) { - state_putc ('\n', s); - col = 0; - } - } - while (tail); - } - - if (col) - state_putc ('\n', s); - -} -#endif - static int get_quote_level (char *line) { int quoted; @@ -1227,12 +946,10 @@ static void text_plain_flowed_handler (BODY * a, STATE * s) char *t; unsigned int curline_len = 1; unsigned int quotelevel = 0, newql = 0; - int append_next_line = 0; int first_line = 1; while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) { - /* fprintf(stderr,"read `%s'",buf); */ bytes -= mutt_strlen (buf); newql = get_quote_level (buf); @@ -1270,8 +987,10 @@ static void text_plain_flowed_handler (BODY * a, STATE * s) } } else { - append_next_line = 1; - /* @todo: add handling of very long lines */ + /* in case there's no [\r\n], we only have a single line + * -> display it (fixes #4709) */ + print_flowed_line (buf, s, quotelevel); + /* TODO add handling of very long lines */ } } if (curline) { @@ -1280,8 +999,6 @@ static void text_plain_flowed_handler (BODY * a, STATE * s) } } - - #define TXTHTML 1 #define TXTPLAIN 2 #define TXTENRICHED 3 @@ -1626,7 +1343,7 @@ void autoview_handler (BODY * a, STATE * s) } if (thepid < 0) { - mutt_perror _("Can't create filter"); + mutt_perror (_("Can't create filter")); if (s->flags & M_DISPLAY) { state_mark_attach (s); @@ -1878,7 +1595,7 @@ void mutt_body_handler (BODY * b, STATE * s) handler = mutt_signed_handler; } else if ((WithCrypto & APPLICATION_PGP) - && mutt_strcasecmp ("encrypted", b->subtype) == 0) { + && safe_strcasecmp ("encrypted", b->subtype) == 0) { p = mutt_get_parameter ("protocol", b->parameter); if (!p)