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

diff --git a/query.c b/query.c
index 77bd99a..570ef07 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>
@@ -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)
@@ -124,7 +129,7 @@ static QUERY *run_query (char *s, int quiet)
   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);
   }
@@ -185,7 +190,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);
+                      safe_strlen (table[num].data->name), 0);
 
   snprintf (s, slen, " %c %3d %s %-*.*s %s",
             table[num].tagged ? '*' : ' ',
@@ -444,7 +449,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 = safe_strlen (buf);
             rfc822_free_address (&tmpa);
           }
           else if (curpos + 2 < buflen) {
@@ -454,7 +459,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 = safe_strlen (buf);
             rfc822_free_address (&tmpa);
           }
         }