#endif
#include "mutt.h"
-#include "mutt_regex.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/rx.h"
+
#include <string.h>
#include <ctype.h>
ALIAS *t = Aliases;
for (; t; t = t->next)
- if (!mutt_strcasecmp (s, t->name))
+ if (!safe_strcasecmp (s, t->name))
return (t->addr);
return (NULL); /* no such alias */
}
if (t) {
i = 0;
for (u = *expn; u; u = u->next) {
- if (mutt_strcmp (a->mailbox, u->data) == 0) { /* alias already found */
+ if (safe_strcmp (a->mailbox, u->data) == 0) { /* alias already found */
dprint (1,
(debugfile,
"mutt_expand_aliases_r(): loop in alias found for '%s'\n",
char namebuf[STRING];
mutt_gecos_name (namebuf, sizeof (namebuf), pw);
- mutt_str_replace (&a->personal, namebuf);
+ str_replace (&a->personal, namebuf);
#ifdef EXACT_ADDRESS
FREE (&a->val);
if (a->name && strstr (a->name, s) == a->name) {
if (!bestname[0]) /* init */
strfcpy (bestname, a->name,
- min (mutt_strlen (a->name) + 1, sizeof (bestname)));
+ min (safe_strlen (a->name) + 1, sizeof (bestname)));
else {
for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
bestname[i] = 0;
}
if (bestname[0] != 0) {
- if (mutt_strcmp (bestname, s) != 0) {
+ if (safe_strcmp (bestname, s) != 0) {
/* we are adding something to the completion */
- strfcpy (s, bestname, mutt_strlen (bestname) + 1);
+ strfcpy (s, bestname, safe_strlen (bestname) + 1);
return 1;
}
return 1;
}
- if (mutt_match_rx_list (addr->mailbox, Alternates)) {
+ if (rx_list_match (Alternates, addr->mailbox)) {
dprint (5,
(debugfile, "mail_addr_is_user: yes, %s matched by alternates.\n",
addr->mailbox));
- if (mutt_match_rx_list (addr->mailbox, UnAlternates))
+ if (rx_list_match (UnAlternates, addr->mailbox))
dprint (5,
(debugfile,
"mail_addr_is_user: but, %s matched by unalternates.\n",