X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=query.c;h=df02f4a0e028e0387074fdf02a54c5d98ca1456b;hp=77bd99a2ee6e00da371f72836a0443156f581999;hb=b0a700a4558d9bb59395ddcf08565a5e709841e1;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/query.c b/query.c
index 77bd99a..df02f4a 100644
--- a/query.c
+++ b/query.c
@@ -17,6 +17,11 @@
 #include "mapping.h"
 #include "sort.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/debug.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -57,7 +62,7 @@ static ADDRESS *result_to_addr (QUERY * r)
   tmp = rfc822_cpy_adr (r->addr);
 
   if (!tmp->next && !tmp->personal)
-    tmp->personal = safe_strdup (r->name);
+    tmp->personal = str_dup (r->name);
 
   mutt_addrlist_to_idna (tmp, NULL);
   return tmp;
@@ -81,7 +86,7 @@ static QUERY *run_query (char *s, int quiet)
   mutt_expand_file_fmt (cmd, sizeof (cmd), QueryCmd, s);
 
   if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
-    dprint (1, (debugfile, "unable to fork command: %s", cmd));
+    debug_print (1, ("unable to fork command: %s\n", cmd));
     return 0;
   }
   if (!quiet)
@@ -95,11 +100,11 @@ static QUERY *run_query (char *s, int quiet)
       if (first == NULL) {
         FirstColumn = 0;
         SecondColumn = 0;
-        first = (QUERY *) safe_calloc (1, sizeof (QUERY));
+        first = (QUERY *) mem_calloc (1, sizeof (QUERY));
         cur = first;
       }
       else {
-        cur->next = (QUERY *) safe_calloc (1, sizeof (QUERY));
+        cur->next = (QUERY *) mem_calloc (1, sizeof (QUERY));
         cur = cur->next;
       }
 
@@ -113,18 +118,18 @@ static QUERY *run_query (char *s, int quiet)
         l = mutt_strwidth (p);
         if (l > FirstColumn)
           FirstColumn = l;
-        cur->name = safe_strdup (p);
+        cur->name = str_dup (p);
         p = strtok (NULL, "\t\n");
         if (p) {
-          cur->other = safe_strdup (p);
+          cur->other = str_dup (p);
         }
       }
     }
   }
-  FREE (&buf);
+  mem_free (&buf);
   fclose (fp);
   if (mutt_wait_filter (thepid)) {
-    dprint (1, (debugfile, "Error: %s\n", msg));
+    debug_print (1, ("Error: %s\n", msg));
     if (!quiet)
       mutt_error ("%s", msg);
   }
@@ -151,11 +156,6 @@ static int query_search (MUTTMENU * m, regex_t * re, int n)
     if (table[n].data->addr->mailbox &&
         !regexec (re, table[n].data->addr->mailbox, 0, NULL, 0))
       return 0;
-#ifdef EXACT_ADDRESS
-    if (table[n].data->addr->val &&
-        !regexec (re, table[n].data->addr->val, 0, NULL, 0))
-      return 0;
-#endif
   }
 
   return REG_NOMATCH;
@@ -185,7 +185,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,
-                      mutt_strlen (table[num].data->name), 0);
+                      str_len (table[num].data->name), 0);
 
   snprintf (s, slen, " %c %3d %s %-*.*s %s",
             table[num].tagged ? '*' : ' ',
@@ -288,7 +288,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
       menu->max++;
 
     menu->data = QueryTable =
-      (ENTRY *) safe_calloc (menu->max, sizeof (ENTRY));
+      (ENTRY *) mem_calloc (menu->max, sizeof (ENTRY));
 
     for (i = 0, queryp = results; queryp; queryp = queryp->next, i++)
       QueryTable[i].data = queryp;
@@ -310,14 +310,14 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
               queryp = results;
               while (queryp) {
                 rfc822_free_address (&queryp->addr);
-                FREE (&queryp->name);
-                FREE (&queryp->other);
+                mem_free (&queryp->name);
+                mem_free (&queryp->other);
                 results = queryp->next;
-                FREE (&queryp);
+                mem_free (&queryp);
                 queryp = results;
               }
               results = newresults;
-              FREE (&QueryTable);
+              mem_free (&QueryTable);
             }
             else {
               /* append */
@@ -345,7 +345,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
 
             if (op == OP_QUERY) {
               menu->data = QueryTable =
-                (ENTRY *) safe_calloc (menu->max, sizeof (ENTRY));
+                (ENTRY *) mem_calloc (menu->max, sizeof (ENTRY));
 
               for (i = 0, queryp = results; queryp;
                    queryp = queryp->next, i++)
@@ -355,7 +355,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
               int clear = 0;
 
               /* append */
-              safe_realloc (&QueryTable, menu->max * sizeof (ENTRY));
+              mem_realloc (&QueryTable, menu->max * sizeof (ENTRY));
 
               menu->data = QueryTable;
 
@@ -444,7 +444,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
             mutt_addrlist_to_local (tmpa);
             tagged = 1;
             rfc822_write_address (buf, buflen, tmpa, 0);
-            curpos = mutt_strlen (buf);
+            curpos = str_len (buf);
             rfc822_free_address (&tmpa);
           }
           else if (curpos + 2 < buflen) {
@@ -454,7 +454,7 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
             strcat (buf, ", "); /* __STRCAT_CHECKED__ */
             rfc822_write_address ((char *) buf + curpos + 1,
                                   buflen - curpos - 1, tmpa, 0);
-            curpos = mutt_strlen (buf);
+            curpos = str_len (buf);
             rfc822_free_address (&tmpa);
           }
         }
@@ -473,13 +473,13 @@ static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
     queryp = results;
     while (queryp) {
       rfc822_free_address (&queryp->addr);
-      FREE (&queryp->name);
-      FREE (&queryp->other);
+      mem_free (&queryp->name);
+      mem_free (&queryp->other);
       results = queryp->next;
-      FREE (&queryp);
+      mem_free (&queryp);
       queryp = results;
     }
-    FREE (&QueryTable);
+    mem_free (&QueryTable);
 
     /* tell whoever called me to redraw the screen when I return */
     set_option (OPTNEEDREDRAW);