#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <string.h>
#include <stdlib.h>
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)
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);
}
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;
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
0, ' ', table[num].data->name,
- safe_strlen (table[num].data->name), 0);
+ mutt_strlen (table[num].data->name), 0);
snprintf (s, slen, " %c %3d %s %-*.*s %s",
table[num].tagged ? '*' : ' ',
mutt_addrlist_to_local (tmpa);
tagged = 1;
rfc822_write_address (buf, buflen, tmpa, 0);
- curpos = safe_strlen (buf);
+ curpos = mutt_strlen (buf);
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
strcat (buf, ", "); /* __STRCAT_CHECKED__ */
rfc822_write_address ((char *) buf + curpos + 1,
buflen - curpos - 1, tmpa, 0);
- curpos = safe_strlen (buf);
+ curpos = mutt_strlen (buf);
rfc822_free_address (&tmpa);
}
}