projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
handler.c
diff --git
a/handler.c
b/handler.c
index
2eb2dc1
..
cd2b1c5
100644
(file)
--- a/
handler.c
+++ b/
handler.c
@@
-19,6
+19,9
@@
#include <sys/stat.h>
#include "mutt.h"
#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 "mutt_curses.h"
#include "rfc1524.h"
#include "keymap.h"
@@
-35,7
+38,7
@@
#include "lib/str.h"
#include "lib/debug.h"
#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] = {
typedef handler_f *handler_t;
int Index_hex[128] = {
@@
-661,7
+664,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
{
enum {
TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE
@@
-774,6
+777,8
@@
void text_enriched_handler (BODY * a, STATE * s)
mem_free (&(stte.buffer));
mem_free (&(stte.line));
mem_free (&(stte.param));
mem_free (&(stte.buffer));
mem_free (&(stte.line));
mem_free (&(stte.param));
+
+ return (0);
}
/*
}
/*
@@
-890,7
+895,7
@@
static void print_flowed_line (char *line, STATE * s, int ql)
state_putc('\n',s); */
}
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];
{
int bytes = a->length;
char buf[LONG_STRING];
@@
-907,7
+912,7
@@
static void text_plain_flowed_handler (BODY * a, STATE * s)
newql = get_quote_level (buf);
if (bytes == 0 || ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r')))) {
newql = get_quote_level (buf);
if (bytes == 0 || ((t = strrchr (buf, '\n')) || (t = strrchr (buf, '\r')))) {
- if (
t
)
+ if (
bytes > 0
)
*t = '\0';
if (str_len (curline) > 0 && curline[str_len (curline) - 1] == ' '
&& newql == quotelevel
*t = '\0';
if (str_len (curline) > 0 && curline[str_len (curline) - 1] == ' '
&& newql == quotelevel
@@
-944,13
+949,14
@@
static void text_plain_flowed_handler (BODY * a, STATE * s)
print_flowed_line (curline, s, quotelevel);
mem_free (&curline);
}
print_flowed_line (curline, s, quotelevel);
mem_free (&curline);
}
+ return (0);
}
#define TXTHTML 1
#define TXTPLAIN 2
#define TXTENRICHED 3
}
#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;
{
BODY *choice = NULL;
BODY *b;
@@
-958,6
+964,7
@@
static void alternative_handler (BODY * a, STATE * s)
char buf[STRING];
int type = 0;
int mustfree = 0;
char buf[STRING];
int type = 0;
int mustfree = 0;
+ int rc = 0;
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED) {
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED) {
@@
-1084,21
+1091,23
@@
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);
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);
}
if (mustfree)
mutt_free_body (&a);
+
+ return (rc);
}
/* handles message/rfc822 body parts */
}
/* 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;
{
struct stat st;
BODY *b;
long off_start;
+ int rc = 0;
off_start = ftell (s->fpin);
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
off_start = ftell (s->fpin);
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
@@
-1123,12
+1132,14
@@
void message_handler (BODY * a, STATE * s)
state_puts (s->prefix, s);
state_putc ('\n', 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);
}
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 */
}
/* returns 1 if decoding the attachment will produce output */
@@
-1168,12
+1179,13
@@
int mutt_can_decode (BODY * a)
return (0);
}
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;
{
BODY *b, *p;
char length[5];
struct stat st;
int count;
+ int rc = 0;
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED) {
if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
a->encoding == ENCUUENCODED) {
@@
-1221,19
+1233,21
@@
void multipart_handler (BODY * a, STATE * s)
state_printf (s, "%s: \n", p->form_name);
}
state_printf (s, "%s: \n", p->form_name);
}
- mutt_body_handler (p, s);
+
rc =
mutt_body_handler (p, s);
state_putc ('\n', 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);
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];
{
rfc1524_entry *entry = rfc1524_new_entry ();
char buffer[LONG_STRING];
@@
-1246,6
+1260,7
@@
void autoview_handler (BODY * a, STATE * s)
FILE *fperr = NULL;
int piped = FALSE;
pid_t thepid;
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);
snprintf (type, sizeof (type), "%s/%s", TYPE (a), a->subtype);
rfc1524_mailcap_lookup (a, type, entry, M_AUTOVIEW);
@@
-1272,7
+1287,7
@@
void autoview_handler (BODY * a, STATE * s)
if ((fpin = safe_fopen (tempfile, "w+")) == NULL) {
mutt_perror ("fopen");
rfc1524_free_entry (&entry);
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);
}
mutt_copy_bytes (s->fpin, fpin, a->length);
@@
-1296,6
+1311,7
@@
void autoview_handler (BODY * a, STATE * s)
state_mark_attach (s);
state_printf (s, _("[-- Can't run %s. --]\n"), command);
}
state_mark_attach (s);
state_printf (s, _("[-- Can't run %s. --]\n"), command);
}
+ rc = -1;
goto bail;
}
goto bail;
}
@@
-1347,9
+1363,10
@@
void autoview_handler (BODY * a, STATE * s)
mutt_clear_error ();
}
rfc1524_free_entry (&entry);
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;
{
const char *access_type;
const char *expiration;
@@
-1359,11
+1376,9
@@
static void external_body_handler (BODY * b, STATE * s)
if (!access_type) {
if (s->flags & M_DISPLAY) {
state_mark_attach (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);
}
expiration = mutt_get_parameter ("expiration", b->parameter);
@@
-1431,6
+1446,7
@@
static void external_body_handler (BODY * b, STATE * s)
CH_DECODE, NULL);
}
}
CH_DECODE, NULL);
}
}
+ return (0);
}
void mutt_decode_attachment (BODY * b, STATE * s)
}
void mutt_decode_attachment (BODY * b, STATE * s)
@@
-1475,7
+1491,7
@@
void mutt_decode_attachment (BODY * b, STATE * s)
iconv_close (cd);
}
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;
{
int decode = 0;
int plaintext = 0;
@@
-1485,6
+1501,7
@@
void mutt_body_handler (BODY * b, STATE * s)
long tmpoffset = 0;
size_t tmplength = 0;
char type[STRING];
long tmpoffset = 0;
size_t tmplength = 0;
char type[STRING];
+ int rc = 0;
int oflags = s->flags;
int oflags = s->flags;
@@
-1624,7
+1641,7
@@
void mutt_body_handler (BODY * b, STATE * s)
/* process the (decoded) body part */
if (handler) {
/* process the (decoded) body part */
if (handler) {
- handler (b, s);
+
rc =
handler (b, s);
if (decode) {
b->length = tmplength;
if (decode) {
b->length = tmplength;
@@
-1653,4
+1670,6
@@
void mutt_body_handler (BODY * b, STATE * s)
bail:
s->flags = oflags | (s->flags & M_FIRSTDONE);
bail:
s->flags = oflags | (s->flags & M_FIRSTDONE);
+
+ return (rc);
}
}