mutt_expand_file_fmt -> m_quotefile_fmt in file.c

[apps/madmutt.git] / lib-ui / query.c

diff --git a/lib-ui/query.c b/lib-ui/query.c
index 11fa388..b0a42d7 100644 (file)
--- a/lib-ui/query.c
+++ b/lib-ui/query.c
@@ -7,15 +7,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
+
 #include <lib-sys/unix.h>
 
 #include <lib-ui/menu.h>
@@ -83,7 +76,7 @@ static QUERY *run_query (char *s, int quiet)
   int l;
 
 
-  mutt_expand_file_fmt (cmd, sizeof (cmd), QueryCmd, s);
+  m_quotefile_fmt(cmd, sizeof (cmd), QueryCmd, s);
 
   if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
     return 0;
@@ -126,7 +119,7 @@ static QUERY *run_query (char *s, int quiet)
     }
   }
   p_delete(&buf);
-  fclose (fp);
+  m_fclose(&fp);
   if (mutt_wait_filter (thepid)) {
     if (!quiet)
       mutt_error ("%s", msg);