#include <sys/stat.h>
#include "mutt.h"
+#include "ascii.h"
+#include "recvattach.h"
+#include "handler.h"
#include "mutt_curses.h"
#include "rfc1524.h"
#include "keymap.h"
#include "copy.h"
#include "charset.h"
#include "mutt_crypt.h"
+#include "state.h"
+#include "attach.h"
#include "lib.h"
#include "lib/mem.h"
#include "lib/str.h"
#include "lib/debug.h"
-#define BUFI_SIZE 1000
-#define BUFO_SIZE 2000
-
-
-typedef void handler_f (BODY *, STATE *);
+typedef int handler_f (BODY *, STATE *);
typedef handler_f *handler_t;
int Index_hex[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;
if (fgets (line, MIN ((ssize_t) sizeof (line), len + 1), s->fpin) == NULL)
break;
- linelen = mutt_strlen (line);
+ linelen = str_len (line);
len -= linelen;
/*
while (len > 0) {
if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
return;
- len -= mutt_strlen (tmps);
- if ((!safe_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 (!safe_strncmp (tmps, "end", 3))
+ len -= str_len (tmps);
+ if (!str_ncmp (tmps, "end", 3))
break;
pt = tmps;
linelen = decode_byte (*pt);
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]) {
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--;
}
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;
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;
}
/* 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') {
{
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) {
}
}
-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
((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) {
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));
+
+ return (0);
}
/*
{
int width;
char *pos, *oldpos;
- int len = mutt_strlen (line);
+ int len = str_len (line);
int i;
if (MaxLineLength > 0) {
/* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
- if (mutt_strlen (line) == 0) {
+ if (str_len (line) == 0) {
if (option (OPTQUOTEEMPTY)) {
if (s->prefix)
state_puts(s->prefix,s);
return;
}
- pos = line + ql + width;
- oldpos = line + ql;
- if (ql > 0 && ISBLANK (*oldpos))
- ++oldpos;
+ pos = line + width;
+ oldpos = line;
/* fprintf(stderr,"oldpos = %p line+len = %p\n",oldpos,line+len); */
state_putc('\n',s); */
}
-static void text_plain_flowed_handler (BODY * a, STATE * s)
+static int text_plain_flowed_handler (BODY * a, STATE * s)
{
int bytes = a->length;
char buf[LONG_STRING];
- char *curline = strdup ("");
- char *t;
+ char *curline = str_dup ("");
+ char *t = NULL;
unsigned int curline_len = 1;
unsigned int quotelevel = 0, newql = 0;
- int first_line = 1;
+ int buf_off, buf_len;
while (bytes > 0 && fgets (buf, sizeof (buf), s->fpin)) {
-
- bytes -= mutt_strlen (buf);
+ buf_len = str_len (buf);
+ bytes -= buf_len;
newql = get_quote_level (buf);
+ /* a change of quoting level in a paragraph - shouldn't happen,
+ * but has to be handled - see RFC 3676, sec. 4.5.
+ */
+ if (newql != quotelevel && curline && *curline) {
+ print_flowed_line (curline, s, quotelevel);
+ *curline = '\0';
+ curline_len = 1;
+ }
+ quotelevel = newql;
+
+ /* XXX - If a line is longer than buf (shouldn't happen), it is split.
+ * This will almost always cause an unintended line break, and
+ * possibly a change in quoting level. But that's better than not
+ * displaying it at all.
+ */
if ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r'))) {
*t = '\0';
- if (mutt_strlen (curline) > 0 && curline[mutt_strlen (curline) - 1] == ' '
- && newql == quotelevel
- && strcmp (curline + quotelevel, "-- ") != 0) {
- if (buf[newql] == ' ')
- curline[mutt_strlen (curline) - 1] = '\0';
-
- curline = realloc (curline, curline_len + mutt_strlen (buf));
- if (curline_len == 1)
- *curline = '\0';
- curline_len += mutt_strlen (buf);
- safe_strncat (curline, curline_len, buf + newql,
- mutt_strlen (buf + newql));
- }
- else {
- if (first_line) {
- first_line = 0;
- }
- else {
- print_flowed_line (curline, s, quotelevel);
- }
- FREE (&curline);
- curline_len = 1;
- curline = realloc (curline, curline_len + mutt_strlen (buf));
- if (curline_len == 1)
- *curline = '\0';
- curline_len += mutt_strlen (buf);
- safe_strncat (curline, curline_len, buf, mutt_strlen (buf));
- quotelevel = newql;
- }
+ buf_len = t - buf;
}
- else {
- /* 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 */
+ buf_off = newql;
+ if (buf[buf_off] == ' ')
+ buf_off++;
+
+ /* signature separator also flushes the previous paragraph */
+ if (strcmp(buf + buf_off, "-- ") == 0 && curline && *curline) {
+ print_flowed_line (curline, s, quotelevel);
+ *curline = '\0';
+ curline_len = 1;
}
+
+ curline = realloc (curline, curline_len + buf_len - buf_off);
+ strcpy (curline + curline_len - 1, buf + buf_off);
+ curline_len += buf_len - buf_off;
+
+ /* if this was a fixed line the paragraph is finished */
+ if (buf_len == 0 || buf[buf_len - 1] != ' ' || strcmp(buf + buf_off, "-- ") == 0) {
+ print_flowed_line (curline, s, quotelevel);
+ *curline = '\0';
+ curline_len = 1;
+ }
+
}
- if (curline) {
- print_flowed_line (curline, s, quotelevel);
- FREE (&curline);
- }
+ 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;
char buf[STRING];
int type = 0;
int mustfree = 0;
+ int rc = 0;
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED) {
}
else {
wild = 1;
- btlen = mutt_strlen (t->data);
+ btlen = str_len (t->data);
}
if (a && a->parts)
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;
+ int rc = 0;
off_start = ftell (s->fpin);
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
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 */
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) {
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];
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 = 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));
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);
state_mark_attach (s);
state_printf (s, _("[-- Can't run %s. --]\n"), command);
}
+ rc = -1;
goto bail;
}
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;
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);
CH_DECODE, NULL);
}
}
+ return (0);
}
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;
long tmpoffset = 0;
size_t tmplength = 0;
char type[STRING];
+ int rc = 0;
int oflags = s->flags;
handler = mutt_signed_handler;
}
else if ((WithCrypto & APPLICATION_PGP)
- && safe_strcasecmp ("encrypted", b->subtype) == 0) {
+ && str_casecmp ("encrypted", b->subtype) == 0) {
p = mutt_get_parameter ("protocol", b->parameter);
if (!p)
/* process the (decoded) body part */
if (handler) {
- handler (b, s);
+ rc = handler (b, s);
if (decode) {
b->length = tmplength;
bail:
s->flags = oflags | (s->flags & M_FIRSTDONE);
+
+ return (rc);
}
projects / apps / madmutt.git / blobdiff