X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fquery.c;h=99631bff692d4d73392d92ff553b58a23037f1fc;hp=2a60afa1760c9247fbcf2a63953be27c2edb4843;hb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e;hpb=96e4b6de291b2195b26289fb03536acd101c6650

diff --git a/lib-ui/query.c b/lib-ui/query.c
index 2a60afa..99631bf 100644
--- a/lib-ui/query.c
+++ b/lib-ui/query.c
@@ -7,21 +7,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-sys/unix.h>
 
 #include <lib-ui/menu.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "alias.h"
@@ -85,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;
@@ -128,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);
@@ -180,7 +171,7 @@ static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
       SecondColumn = QUERY_MIN_COLUMN_LENGHT;
   }
 
-  rfc822_write_address (buf, sizeof (buf), table[num].data->addr, 1);
+  rfc822_addrcat(buf, sizeof (buf), table[num].data->addr, 1);
 
   mutt_format_string (buf2, sizeof (buf2),
                       FirstColumn + 2, FirstColumn + 2,
@@ -222,7 +213,7 @@ int mutt_query_complete (char *buf, ssize_t buflen)
       tmpa = result_to_addr (results);
       mutt_addrlist_to_local (tmpa);
       buf[0] = '\0';
-      rfc822_write_address (buf, buflen, tmpa, 0);
+      rfc822_addrcat(buf, buflen, tmpa, 0);
       address_list_wipe(&tmpa);
       mutt_clear_error ();
       return (0);
@@ -350,7 +341,7 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
                 QueryTable[i].data = queryp;
             }
             else {
-              int clear = 0;
+              int doclear = 0;
 
               /* append */
               p_realloc(&QueryTable, menu->max);
@@ -361,10 +352,10 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
                    queryp = queryp->next, i++) {
                 /* once we hit new entries, clear/init the tag */
                 if (queryp == newresults)
-                  clear = 1;
+                  doclear = 1;
 
                 QueryTable[i].data = queryp;
-                if (clear)
+                if (doclear)
                   QueryTable[i].tagged = 0;
               }
             }
@@ -435,7 +426,7 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
 
             mutt_addrlist_to_local (tmpa);
             tagged = 1;
-            rfc822_write_address (buf, buflen, tmpa, 0);
+            rfc822_addrcat(buf, buflen, tmpa, 0);
             curpos = m_strlen(buf);
             address_list_wipe(&tmpa);
           }
@@ -443,9 +434,8 @@ 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__ */
-            rfc822_write_address ((char *) buf + curpos + 1,
-                                  buflen - curpos - 1, tmpa, 0);
+            m_strcat(buf, buflen, ", ");
+            rfc822_addrcat(buf + curpos + 1, buflen - curpos - 1, tmpa, 0);
             curpos = m_strlen(buf);
             address_list_wipe(&tmpa);
           }
@@ -456,7 +446,7 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
         address_t *tmpa = result_to_addr (QueryTable[menu->current].data);
 
         mutt_addrlist_to_local (tmpa);
-        rfc822_write_address (buf, buflen, tmpa, 0);
+        rfc822_addrcat(buf, buflen, tmpa, 0);
         address_list_wipe(&tmpa);
       }