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
0617b25
..
a6a085c
100644
(file)
--- a/
handler.c
+++ b/
handler.c
@@
-28,6
+28,10
@@
#include "mutt_crypt.h"
#include "lib.h"
#include "mutt_crypt.h"
#include "lib.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/debug.h"
#define BUFI_SIZE 1000
#define BUFO_SIZE 2000
#define BUFI_SIZE 1000
#define BUFO_SIZE 2000
@@
-284,8
+288,7
@@
void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
buf[i++] = ch;
}
if (i != 4) {
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;
}
break;
}
@@
-367,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 ((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);
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);
break;
pt = tmps;
linelen = decode_byte (*pt);
@@
-868,7
+871,7
@@
static void flowed_stuff (STATE * s, char *cont, int level)
}
else if ((!(s->flags & M_PRINTING)) && ((*cont == ' ') || (*cont == '>')
|| (!level
}
else if ((!(s->flags & M_PRINTING)) && ((*cont == ' ') || (*cont == '>')
|| (!level
- && !
mutt
_strncmp (cont, "From ",
+ && !
safe
_strncmp (cont, "From ",
5))))
state_putc (' ', s);
}
5))))
state_putc (' ', s);
}
@@
-1623,7
+1626,7
@@
void autoview_handler (BODY * a, STATE * s)
}
if (thepid < 0) {
}
if (thepid < 0) {
- mutt_perror
_("Can't create filter"
);
+ mutt_perror
(_("Can't create filter")
);
if (s->flags & M_DISPLAY) {
state_mark_attach (s);
if (s->flags & M_DISPLAY) {
state_mark_attach (s);
@@
-1875,7
+1878,7
@@
void mutt_body_handler (BODY * b, STATE * s)
handler = mutt_signed_handler;
}
else if ((WithCrypto & APPLICATION_PGP)
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)
p = mutt_get_parameter ("protocol", b->parameter);
if (!p)