projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use m_functions(), you'll be fresh-faced.
[apps/madmutt.git]
/
handler.c
diff --git
a/handler.c
b/handler.c
index
26d1a99
..
51f4c32
100644
(file)
--- a/
handler.c
+++ b/
handler.c
@@
-7,17
+7,6
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-
#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
@@
-25,6
+14,8
@@
#include <lib-ui/curses.h>
#include <lib-ui/curses.h>
+#include <lib-sys/unix.h>
+
#include "mutt.h"
#include "recvattach.h"
#include "handler.h"
#include "mutt.h"
#include "recvattach.h"
#include "handler.h"
@@
-148,7
+139,7
@@
static void qp_decode_line (char *dest, char *src, ssize_t * l, int last)
*
*/
*
*/
-void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
+
static
void mutt_decode_quoted (STATE * s, long len, int istext, iconv_t cd)
{
char line[STRING];
char decline[2 * STRING];
{
char line[STRING];
char decline[2 * STRING];
@@
-279,14
+270,14
@@
void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
state_reset_prefix (s);
}
state_reset_prefix (s);
}
-unsigned char decode_byte (char ch)
+
static
unsigned char decode_byte (char ch)
{
if (ch == 96)
return 0;
return ch - 32;
}
{
if (ch == 96)
return 0;
return ch - 32;
}
-void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
+
static
void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
{
char tmps[SHORT_STRING];
char linelen, c, l, out;
{
char tmps[SHORT_STRING];
char linelen, c, l, out;
@@
-640,7
+631,7
@@
static void enriched_set_flags (const char *tag, struct enriched_state *stte)
}
}
}
}
-int text_enriched_handler (BODY * a, STATE * s)
+
static
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
@@
-1092,7
+1083,7
@@
static int autoview_handler (BODY * a, STATE * s)
mutt_copy_bytes (s->fpin, fpin, a->length);
if (!piped) {
mutt_copy_bytes (s->fpin, fpin, a->length);
if (!piped) {
-
safe_fclose
(&fpin);
+
m_fclose
(&fpin);
thepid = mutt_create_filter (command, NULL, &fpout, &fperr);
}
else {
thepid = mutt_create_filter (command, NULL, &fpout, &fperr);
}
else {
@@
-1149,12
+1140,12
@@
static int autoview_handler (BODY * a, STATE * s)
}
bail:
}
bail:
-
safe_fclose
(&fpout);
-
safe_fclose
(&fperr);
+
m_fclose
(&fpout);
+
m_fclose
(&fperr);
mutt_wait_filter (thepid);
if (piped)
mutt_wait_filter (thepid);
if (piped)
-
safe_fclose
(&fpin);
+
m_fclose
(&fpin);
else
mutt_unlink (tempfile);
else
mutt_unlink (tempfile);
@@
-1259,12
+1250,11
@@
void mutt_decode_attachment (BODY * b, STATE * s)
if (s->flags & M_CHARCONV) {
const char *charset = parameter_getval(b->parameter, "charset");
if (s->flags & M_CHARCONV) {
const char *charset = parameter_getval(b->parameter, "charset");
- if (!
option (OPTSTRICTMIME) && !
charset)
+ if (!charset)
charset = charset_getfirst(AssumedCharset);
if (charset && Charset)
cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
charset = charset_getfirst(AssumedCharset);
if (charset && Charset)
cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
- }
- else {
+ } else {
if (b->file_charset)
cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM);
}
if (b->file_charset)
cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM);
}
@@
-1397,10
+1387,9
@@
int mutt_body_handler (BODY * b, STATE * s)
if (!plaintext) {
/* decode to a tempfile, saving the original destination */
fp = s->fpout;
if (!plaintext) {
/* decode to a tempfile, saving the original destination */
fp = s->fpout;
-
mutt_mktemp (tempfile
);
- if (
(s->fpout = safe_fopen (tempfile, "w")) == NULL
) {
+
s->fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (
!s->fpout
) {
mutt_error _("Unable to open temporary file!");
mutt_error _("Unable to open temporary file!");
-
goto bail;
}
/* decoding the attachment changes the size and offset, so save a copy
goto bail;
}
/* decoding the attachment changes the size and offset, so save a copy
@@
-1416,16
+1405,16
@@
int mutt_body_handler (BODY * b, STATE * s)
s->prefix = NULL;
decode = 1;
s->prefix = NULL;
decode = 1;
- }
- else
+ } else {
b->type = TYPETEXT;
b->type = TYPETEXT;
+ }
mutt_decode_attachment (b, s);
if (decode) {
b->length = ftello (s->fpout);
b->offset = 0;
mutt_decode_attachment (b, s);
if (decode) {
b->length = ftello (s->fpout);
b->offset = 0;
-
fclose (
s->fpout);
+
m_fclose(&
s->fpout);
/* restore final destination and substitute the tempfile for input */
s->fpout = fp;
/* restore final destination and substitute the tempfile for input */
s->fpout = fp;
@@
-1449,7
+1438,7
@@
int mutt_body_handler (BODY * b, STATE * s)
b->offset = tmpoffset;
/* restore the original source stream */
b->offset = tmpoffset;
/* restore the original source stream */
-
fclose (
s->fpin);
+
m_fclose(&
s->fpin);
s->fpin = fp;
}
}
s->fpin = fp;
}
}