X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=0f37639659b29a82e45fdcae79361e84262e156c;hp=7f24f9d32eb775f53b85835536e4f052efacbd46;hb=6790552986464d9ad4be03f361a332441b0f08eb;hpb=1ee89902de184a640c171ae3285bff6882a791bd

diff --git a/handler.c b/handler.c
index 7f24f9d..0f37639 100644
--- a/handler.c
+++ b/handler.c
@@ -14,6 +14,8 @@
 
 #include <lib-ui/curses.h>
 
+#include <lib-sys/unix.h>
+
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
@@ -137,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];
@@ -268,14 +270,14 @@ void mutt_decode_base64 (STATE * s, long len, int istext, iconv_t cd)
   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;
 }
 
-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;
@@ -629,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
@@ -1081,7 +1083,7 @@ static int autoview_handler (BODY * a, STATE * s)
     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 {
@@ -1138,12 +1140,12 @@ static int autoview_handler (BODY * a, STATE * s)
     }
 
   bail:
-    safe_fclose (&fpout);
-    safe_fclose (&fperr);
+    m_fclose(&fpout);
+    m_fclose(&fperr);
 
     mutt_wait_filter (thepid);
     if (piped)
-      safe_fclose (&fpin);
+      m_fclose(&fpin);
     else
       mutt_unlink (tempfile);
 
@@ -1386,10 +1388,9 @@ int mutt_body_handler (BODY * b, STATE * s)
       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!");
-
           goto bail;
         }
         /* decoding the attachment changes the size and offset, so save a copy
@@ -1405,9 +1406,9 @@ int mutt_body_handler (BODY * b, STATE * s)
         s->prefix = NULL;
 
         decode = 1;
-      }
-      else
+      } else {
         b->type = TYPETEXT;
+      }
 
       mutt_decode_attachment (b, s);