X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=query.c;h=398f3b4b9390d4210ee3aca1ceef3f97dc703087;hp=58ece1f703e9dde5c5eec7df185aff8f630da612;hb=61fec8f6b3bff64d96d016a14729ab1ea2c4a2e8;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/query.c b/query.c
index 58ece1f..398f3b4 100644
--- a/query.c
+++ b/query.c
@@ -12,15 +12,16 @@
 #endif
 
 #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 "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_idna.h"
-#include "mapping.h"
 #include "sort.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -28,7 +29,7 @@
 #include <ctype.h>
 
 typedef struct query {
-  ADDRESS *addr;
+  address_t *addr;
   char *name;
   char *other;
   struct query *next;
@@ -56,14 +57,14 @@ static int SecondColumn;
 static void query_menu (char *buf, size_t buflen, QUERY * results,
                         int retbuf);
 
-static ADDRESS *result_to_addr (QUERY * r)
+static address_t *result_to_addr (QUERY * r)
 {
-  static ADDRESS *tmp;
+  static address_t *tmp;
 
-  tmp = rfc822_cpy_adr (r->addr);
+  tmp = address_list_dup (r->addr);
 
   if (!tmp->next && !tmp->personal)
-    tmp->personal = str_dup (r->name);
+    tmp->personal = m_strdup(r->name);
 
   mutt_addrlist_to_idna (tmp, NULL);
   return tmp;
@@ -119,10 +120,10 @@ static QUERY *run_query (char *s, int quiet)
         l = mutt_strwidth (p);
         if (l > FirstColumn)
           FirstColumn = l;
-        cur->name = str_dup (p);
+        cur->name = m_strdup(p);
         p = strtok (NULL, "\t\n");
         if (p) {
-          cur->other = str_dup (p);
+          cur->other = m_strdup(p);
         }
       }
     }
@@ -186,7 +187,7 @@ static void query_entry (char *s, size_t slen, MUTTMENU * m, int num)
   mutt_format_string (buf2, sizeof (buf2),
                       FirstColumn + 2, FirstColumn + 2,
                       0, ' ', table[num].data->name,
-                      str_len (table[num].data->name), 0);
+                      m_strlen(table[num].data->name), 0);
 
   snprintf (s, slen, " %c %3d %s %-*.*s %s",
             table[num].tagged ? '*' : ' ',
@@ -208,7 +209,7 @@ static int query_tag (MUTTMENU * menu, int n, int m)
 int mutt_query_complete (char *buf, size_t buflen)
 {
   QUERY *results = NULL;
-  ADDRESS *tmpa;
+  address_t *tmpa;
 
   if (!QueryCmd) {
     mutt_error _("Query command not defined.");
@@ -224,7 +225,7 @@ int mutt_query_complete (char *buf, size_t buflen)
       mutt_addrlist_to_local (tmpa);
       buf[0] = '\0';
       rfc822_write_address (buf, buflen, tmpa, 0);
-      rfc822_free_address (&tmpa);
+      address_delete (&tmpa);
       mutt_clear_error ();
       return (0);
     }
@@ -309,7 +310,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
             if (op == OP_QUERY) {
               queryp = results;
               while (queryp) {
-                rfc822_free_address (&queryp->addr);
+                address_delete (&queryp->addr);
                 p_delete(&queryp->name);
                 p_delete(&queryp->other);
                 results = queryp->next;
@@ -375,23 +376,20 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
 
       case OP_CREATE_ALIAS:
         if (menu->tagprefix) {
-          ADDRESS *naddr = NULL;
+          address_t *naddr = NULL;
 
           for (i = 0; i < menu->max; i++)
             if (QueryTable[i].tagged) {
-              ADDRESS *a = result_to_addr (QueryTable[i].data);
-
-              rfc822_append (&naddr, a);
-              rfc822_free_address (&a);
+              address_list_append(&naddr, result_to_addr(QueryTable[i].data));
             }
 
           mutt_create_alias (NULL, naddr);
         }
         else {
-          ADDRESS *a = result_to_addr (QueryTable[menu->current].data);
+          address_t *a = result_to_addr (QueryTable[menu->current].data);
 
           mutt_create_alias (NULL, a);
-          rfc822_free_address (&a);
+          address_delete (&a);
         }
         break;
 
@@ -411,10 +409,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
         else {
           for (i = 0; i < menu->max; i++)
             if (QueryTable[i].tagged) {
-              ADDRESS *a = result_to_addr (QueryTable[i].data);
-
-              rfc822_append (&msg->env->to, a);
-              rfc822_free_address (&a);
+              address_list_append(&msg->env->to, result_to_addr(QueryTable[i].data));
             }
         }
         ci_send_message (0, msg, NULL, Context, NULL);
@@ -432,46 +427,46 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
       int tagged = 0;
       size_t curpos = 0;
 
-      memset (buf, 0, buflen);
+      p_clear(buf, buflen);
 
       /* check for tagged entries */
       for (i = 0; i < menu->max; i++) {
         if (QueryTable[i].tagged) {
           if (curpos == 0) {
-            ADDRESS *tmpa = result_to_addr (QueryTable[i].data);
+            address_t *tmpa = result_to_addr (QueryTable[i].data);
 
             mutt_addrlist_to_local (tmpa);
             tagged = 1;
             rfc822_write_address (buf, buflen, tmpa, 0);
-            curpos = str_len (buf);
-            rfc822_free_address (&tmpa);
+            curpos = m_strlen(buf);
+            address_delete (&tmpa);
           }
           else if (curpos + 2 < buflen) {
-            ADDRESS *tmpa = result_to_addr (QueryTable[i].data);
+            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);
-            curpos = str_len (buf);
-            rfc822_free_address (&tmpa);
+            curpos = m_strlen(buf);
+            address_delete (&tmpa);
           }
         }
       }
       /* then enter current message */
       if (!tagged) {
-        ADDRESS *tmpa = result_to_addr (QueryTable[menu->current].data);
+        address_t *tmpa = result_to_addr (QueryTable[menu->current].data);
 
         mutt_addrlist_to_local (tmpa);
         rfc822_write_address (buf, buflen, tmpa, 0);
-        rfc822_free_address (&tmpa);
+        address_delete (&tmpa);
       }
 
     }
 
     queryp = results;
     while (queryp) {
-      rfc822_free_address (&queryp->addr);
+      address_delete (&queryp->addr);
       p_delete(&queryp->name);
       p_delete(&queryp->other);
       results = queryp->next;