X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fquery.c;h=2ce89614922d934fe565771ae30814c25edbf4a2;hb=d031b12a6bfef909d3f4170a7b5e438f4dd5f67e;hp=62ecd9a9c45ba1a89c5fd3e09ffe09a3370b0069;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91;p=apps%2Fmadmutt.git

diff --git a/lib-ui/query.c b/lib-ui/query.c
index 62ecd9a..2ce8961 100644
--- a/lib-ui/query.c
+++ b/lib-ui/query.c
@@ -76,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;
@@ -434,7 +434,7 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
             address_t *tmpa = result_to_addr (QueryTable[i].data);
 
             mutt_addrlist_to_local (tmpa);
-            strcat (buf, ", "); /* __STRCAT_CHECKED__ */
+            m_strcat(buf, buflen, ", ");
             rfc822_write_address ((char *) buf + curpos + 1,
                                   buflen - curpos - 1, tmpa, 0);
             curpos = m_strlen(buf);