X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fquery.c;h=b0a42d723b21aceec11ef1db757320bf50de52e3;hp=11fa388831a4489ac87619a91e4db7f50899ee27;hb=70e9ad0d77eb1c2d7ef76afdba6825de75d5599f;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/lib-ui/query.c b/lib-ui/query.c
index 11fa388..b0a42d7 100644
--- 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);