X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc1524.c;h=576f2122fdc19f43e108b1c4923d8fd3bfc28c56;hp=de7ec1188adfdda2ee02ad42d357e34e13c9a096;hb=c8b8b9539aaf11b48c4c1e5baba434db09722111;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/lib-mime/rfc1524.c b/lib-mime/rfc1524.c
index de7ec11..576f212 100644
--- a/lib-mime/rfc1524.c
+++ b/lib-mime/rfc1524.c
@@ -35,19 +35,6 @@
  * rfc1524.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <unistd.h>
-
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
@@ -450,9 +437,8 @@ int rfc1524_expand_filename (char *nametemplate,
       m_strcpy(newfile, nflen, oldfile);
   }
   else if (!oldfile) {
-    mutt_expand_fmt (newfile, nflen, nametemplate, "mutt");
-  }
-  else {                        /* oldfile && nametemplate */
+    m_snsubst(newfile, nflen, nametemplate, "mutt");
+  } else {                        /* oldfile && nametemplate */
 
 
     /* first, compare everything left from the "%s"