X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=4ba746c82e43c04195b0fabe4f9794dbf73ee94a;hp=9a90f6fbbb5c654594ce7e17366525bd90d53a05;hb=841a368ddea400022328f35dd8c7a3eb6f543892;hpb=c3e57678c8be193fc137854020f3a90887be97c9 diff --git a/handler.c b/handler.c index 9a90f6f..4ba746c 100644 --- a/handler.c +++ b/handler.c @@ -26,12 +26,14 @@ #include "copy.h" #include "charset.h" #include "mutt_crypt.h" +#include "state.h" +#include "attach.h" #include "lib.h" - -#define BUFI_SIZE 1000 -#define BUFO_SIZE 2000 - +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/str.h" +#include "lib/debug.h" typedef void handler_f (BODY *, STATE *); typedef handler_f *handler_t; @@ -58,52 +60,6 @@ int Index_64[128] = { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 }; -static void state_prefix_put (const char *d, size_t dlen, STATE * s) -{ - if (s->prefix) - while (dlen--) - state_prefix_putc (*d++, s); - else - fwrite (d, dlen, 1, s->fpout); -} - -void mutt_convert_to_state (iconv_t cd, char *bufi, size_t * l, STATE * s) -{ - char bufo[BUFO_SIZE]; - ICONV_CONST char *ib; - char *ob; - size_t ibl, obl; - - if (!bufi) { - if (cd != (iconv_t) (-1)) { - ob = bufo, obl = sizeof (bufo); - iconv (cd, 0, 0, &ob, &obl); - if (ob != bufo) - state_prefix_put (bufo, ob - bufo, s); - } - if (Quotebuf[0] != '\0') - state_prefix_putc ('\n', s); - return; - } - - if (cd == (iconv_t) (-1)) { - state_prefix_put (bufi, *l, s); - *l = 0; - return; - } - - ib = bufi, ibl = *l; - for (;;) { - ob = bufo, obl = sizeof (bufo); - mutt_iconv (cd, &ib, &ibl, &ob, &obl, 0, "?"); - if (ob == bufo) - break; - state_prefix_put (bufo, ob - bufo, s); - } - memmove (bufi, ib, ibl); - *l = ibl; -} - void mutt_decode_xbit (STATE * s, long len, int istext, iconv_t cd) { int c, ch; @@ -238,7 +194,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 = strlen (line); + linelen = str_len (line); len -= linelen; /* @@ -284,8 +240,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; } @@ -366,15 +321,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 -= mutt_strlen (tmps); - if ((!mutt_strncmp (tmps, "begin", 5)) && ISSPACE (tmps[5])) + len -= str_len (tmps); + if ((!str_ncmp (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)) + len -= str_len (tmps); + if (!str_ncmp (tmps, "end", 3)) break; pt = tmps; linelen = decode_byte (*pt); @@ -514,7 +469,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 += mutt_strlen (stte->s->prefix); + stte->indent_len += str_len (stte->s->prefix); } if (stte->tag_level[RICH_EXCERPT]) { @@ -522,11 +477,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 += mutt_strlen (stte->s->prefix); + stte->indent_len += str_len (stte->s->prefix); } else { state_puts ("> ", stte->s); - stte->indent_len += mutt_strlen ("> "); + stte->indent_len += str_len ("> "); } x--; } @@ -556,7 +511,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; - safe_realloc (&stte->line, stte->line_max + 1); + mem_realloc (&stte->line, stte->line_max + 1); } strcat (stte->line, stte->buffer); /* __STRCAT_CHECKED__ */ stte->line_len += stte->word_len; @@ -573,7 +528,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) - safe_realloc (&stte->param, (stte->param_len += STRING)); + mem_realloc (&stte->param, (stte->param_len += STRING)); stte->param[stte->param_used++] = c; } @@ -583,7 +538,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; - safe_realloc (&stte->buffer, stte->buff_len + 1); + mem_realloc (&stte->buffer, stte->buff_len + 1); } if ((!stte->tag_level[RICH_NOFILL] && ISSPACE (c)) || c == '\0') { @@ -628,9 +583,9 @@ static void enriched_puts (char *s, struct enriched_state *stte) { char *c; - if (stte->buff_len < stte->buff_used + mutt_strlen (s)) { + if (stte->buff_len < stte->buff_used + str_len (s)) { stte->buff_len += LONG_STRING; - safe_realloc (&stte->buffer, stte->buff_len + 1); + mem_realloc (&stte->buffer, stte->buff_len + 1); } c = s; while (*c) { @@ -724,15 +679,15 @@ void text_enriched_handler (BODY * a, STATE * s) ((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) < 72) ? (COLS - 4) : 72); stte.line_max = stte.WrapMargin * 4; - stte.line = (char *) safe_calloc (1, stte.line_max + 1); - stte.param = (char *) safe_calloc (1, STRING); + stte.line = (char *) mem_calloc (1, stte.line_max + 1); + stte.param = (char *) mem_calloc (1, STRING); stte.param_len = STRING; stte.param_used = 0; if (s->prefix) { state_puts (s->prefix, s); - stte.indent_len += mutt_strlen (s->prefix); + stte.indent_len += str_len (s->prefix); } while (state != DONE) { @@ -816,9 +771,9 @@ void text_enriched_handler (BODY * a, STATE * s) state_putc ('\n', s); /* add a final newline */ - FREE (&(stte.buffer)); - FREE (&(stte.line)); - FREE (&(stte.param)); + mem_free (&(stte.buffer)); + mem_free (&(stte.line)); + mem_free (&(stte.param)); } /* @@ -830,287 +785,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 -= 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 = 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; @@ -1123,7 +797,7 @@ static void print_flowed_line (char *line, STATE * s, int ql) { int width; char *pos, *oldpos; - int len = strlen (line); + int len = str_len (line); int i; if (MaxLineLength > 0) { @@ -1147,7 +821,7 @@ static void print_flowed_line (char *line, STATE * s, int ql) /* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */ - if (strlen (line) == 0) { + if (str_len (line) == 0) { if (option (OPTQUOTEEMPTY)) { if (s->prefix) state_puts(s->prefix,s); @@ -1224,30 +898,28 @@ 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 -= strlen (buf); + bytes -= str_len (buf); newql = get_quote_level (buf); if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) { *t = '\0'; - if (strlen (curline) > 0 && curline[strlen (curline) - 1] == ' ' + if (str_len (curline) > 0 && curline[str_len (curline) - 1] == ' ' && newql == quotelevel && strcmp (curline + quotelevel, "-- ") != 0) { if (buf[newql] == ' ') - curline[strlen (curline) - 1] = '\0'; + curline[str_len (curline) - 1] = '\0'; - curline = realloc (curline, curline_len + strlen (buf)); + curline = realloc (curline, curline_len + str_len (buf)); if (curline_len == 1) *curline = '\0'; - curline_len += strlen (buf); - safe_strncat (curline, curline_len, buf + newql, - strlen (buf + newql)); + curline_len += str_len (buf); + str_ncat (curline, curline_len, buf + newql, + str_len (buf + newql)); } else { if (first_line) { @@ -1256,29 +928,36 @@ static void text_plain_flowed_handler (BODY * a, STATE * s) else { print_flowed_line (curline, s, quotelevel); } - FREE (&curline); + mem_free (&curline); curline_len = 1; - curline = realloc (curline, curline_len + strlen (buf)); + curline = realloc (curline, curline_len + str_len (buf)); if (curline_len == 1) *curline = '\0'; - curline_len += strlen (buf); - safe_strncat (curline, curline_len, buf, strlen (buf)); + curline_len += str_len (buf); + str_ncat (curline, curline_len, buf, str_len (buf)); quotelevel = newql; } } - else { - append_next_line = 1; - /* @todo: add handling of very long lines */ + else if (bytes == 0) { + /* in case there's no line end it's likely the last line + * so append to current (if any) */ + 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)); + break; } } if (curline) { print_flowed_line (curline, s, quotelevel); - FREE (&curline); + mem_free (&curline); } } - - #define TXTHTML 1 #define TXTPLAIN 2 #define TXTENRICHED 3 @@ -1326,7 +1005,7 @@ static void alternative_handler (BODY * a, STATE * s) } else { wild = 1; - btlen = mutt_strlen (t->data); + btlen = str_len (t->data); } if (a && a->parts) @@ -1583,11 +1262,11 @@ void 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 = safe_strdup (a->filename); + fname = str_dup (a->filename); mutt_sanitize_filename (fname, 1); rfc1524_expand_filename (entry->nametemplate, fname, tempfile, sizeof (tempfile)); - FREE (&fname); + mem_free (&fname); if (entry->command) { strfcpy (command, entry->command, sizeof (command)); @@ -1623,7 +1302,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); @@ -1875,7 +1554,7 @@ void mutt_body_handler (BODY * b, STATE * s) handler = mutt_signed_handler; } else if ((WithCrypto & APPLICATION_PGP) - && mutt_strcasecmp ("encrypted", b->subtype) == 0) { + && str_casecmp ("encrypted", b->subtype) == 0) { p = mutt_get_parameter ("protocol", b->parameter); if (!p)