projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mem_calloc -> p_new
[apps/madmutt.git]
/
handler.c
diff --git
a/handler.c
b/handler.c
index
9c379dc
..
39bc056
100644
(file)
--- a/
handler.c
+++ b/
handler.c
@@
-18,6
+18,8
@@
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/stat.h>
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "recvattach.h"
#include "mutt.h"
#include "ascii.h"
#include "recvattach.h"
@@
-583,18
+585,18
@@
static void enriched_putc (int c, struct enriched_state *stte)
}
}
}
}
-static void enriched_puts (char *s, struct enriched_state *stte)
+static void enriched_puts (c
onst c
har *s, struct enriched_state *stte)
{
{
- c
har *c
;
+ c
onst char *p
;
if (stte->buff_len < stte->buff_used + str_len (s)) {
stte->buff_len += LONG_STRING;
mem_realloc (&stte->buffer, stte->buff_len + 1);
}
if (stte->buff_len < stte->buff_used + str_len (s)) {
stte->buff_len += LONG_STRING;
mem_realloc (&stte->buffer, stte->buff_len + 1);
}
- c = s;
- while (*c) {
- stte->buffer[stte->buff_used++] = *c;
-
c
++;
+
+ p = s;
+ while (*p) {
+
stte->buffer[stte->buff_used++] = *p
++;
}
}
}
}
@@
-683,8
+685,8
@@
int 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;
((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
72) ? (COLS - 4) : 72);
stte.line_max = stte.WrapMargin * 4;
- stte.line =
(char *) mem_calloc (1
, stte.line_max + 1);
- stte.param =
(char *) mem_calloc (1
, STRING);
+ stte.line =
p_new(char
, stte.line_max + 1);
+ stte.param =
p_new(char
, STRING);
stte.param_len = STRING;
stte.param_used = 0;
stte.param_len = STRING;
stte.param_used = 0;
@@
-775,9
+777,9
@@
int text_enriched_handler (BODY * a, STATE * s)
state_putc ('\n', s); /* add a final newline */
state_putc ('\n', s); /* add a final newline */
-
mem_free
(&(stte.buffer));
-
mem_free
(&(stte.line));
-
mem_free
(&(stte.param));
+
p_delete
(&(stte.buffer));
+
p_delete
(&(stte.line));
+
p_delete
(&(stte.param));
return (0);
}
return (0);
}
@@
-936,7
+938,7
@@
static int message_handler (BODY * a, STATE * s)
{
struct stat st;
BODY *b;
{
struct stat st;
BODY *b;
-
LOFF_T
off_start;
+
off_t
off_start;
int rc = 0;
off_start = ftello (s->fpin);
int rc = 0;
off_start = ftello (s->fpin);
@@
-1099,7
+1101,7
@@
static int autoview_handler (BODY * a, STATE * s)
mutt_sanitize_filename (fname, 1);
rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
sizeof (tempfile));
mutt_sanitize_filename (fname, 1);
rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
sizeof (tempfile));
-
mem_free
(&fname);
+
p_delete
(&fname);
if (entry->command) {
strfcpy (command, entry->command, sizeof (command));
if (entry->command) {
strfcpy (command, entry->command, sizeof (command));
@@
-1288,7
+1290,7
@@
void mutt_decode_attachment (BODY * b, STATE * s)
if (istext) {
if (s->flags & M_CHARCONV) {
if (istext) {
if (s->flags & M_CHARCONV) {
- char *charset = mutt_get_parameter ("charset", b->parameter);
+ c
onst c
har *charset = mutt_get_parameter ("charset", b->parameter);
if (!option (OPTSTRICTMIME) && !charset)
charset = mutt_get_first_charset (AssumedCharset);
if (!option (OPTSTRICTMIME) && !charset)
charset = mutt_get_first_charset (AssumedCharset);
@@
-1304,16
+1306,24
@@
void mutt_decode_attachment (BODY * b, STATE * s)
fseeko (s->fpin, b->offset, 0);
switch (b->encoding) {
case ENCQUOTEDPRINTABLE:
fseeko (s->fpin, b->offset, 0);
switch (b->encoding) {
case ENCQUOTEDPRINTABLE:
- mutt_decode_quoted (s, b->length, istext, cd);
+ mutt_decode_quoted (s, b->length, istext ||
+ ((WithCrypto & APPLICATION_PGP) &&
+ mutt_is_application_pgp (b)), cd);
break;
case ENCBASE64:
break;
case ENCBASE64:
- mutt_decode_base64 (s, b->length, istext, cd);
+ mutt_decode_base64 (s, b->length, istext ||
+ ((WithCrypto & APPLICATION_PGP) &&
+ mutt_is_application_pgp (b)), cd);
break;
case ENCUUENCODED:
break;
case ENCUUENCODED:
- mutt_decode_uuencoded (s, b->length, istext, cd);
+ mutt_decode_uuencoded (s, b->length, istext
+ || ((WithCrypto & APPLICATION_PGP) &&
+ mutt_is_application_pgp (b)), cd);
break;
default:
break;
default:
- mutt_decode_xbit (s, b->length, istext, cd);
+ mutt_decode_xbit (s, b->length, istext
+ || ((WithCrypto & APPLICATION_PGP) &&
+ mutt_is_application_pgp (b)), cd);
break;
}
break;
}