projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
alias.c
diff --git
a/alias.c
b/alias.c
index
a373877
..
a41c8d8
100644
(file)
--- a/
alias.c
+++ b/
alias.c
@@
-12,10
+12,14
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
-#include "mutt_regex.h"
#include "mutt_curses.h"
#include "mutt_idna.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>
#include <string.h>
#include <ctype.h>
@@
-24,7
+28,7
@@
ADDRESS *mutt_lookup_alias (const char *s)
ALIAS *t = Aliases;
for (; t; t = t->next)
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 */
}
return (t->addr);
return (NULL); /* no such alias */
}
@@
-44,7
+48,7
@@
static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
if (t) {
i = 0;
for (u = *expn; u; u = u->next) {
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",
dprint (1,
(debugfile,
"mutt_expand_aliases_r(): loop in alias found for '%s'\n",
@@
-81,7
+85,7
@@
static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
char namebuf[STRING];
mutt_gecos_name (namebuf, sizeof (namebuf), pw);
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);
#ifdef EXACT_ADDRESS
FREE (&a->val);
@@
-394,7
+398,7
@@
int mutt_alias_complete (char *s, size_t buflen)
if (a->name && strstr (a->name, s) == a->name) {
if (!bestname[0]) /* init */
strfcpy (bestname, a->name,
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;
else {
for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
bestname[i] = 0;
@@
-404,9
+408,9
@@
int mutt_alias_complete (char *s, size_t buflen)
}
if (bestname[0] != 0) {
}
if (bestname[0] != 0) {
- if (
mutt
_strcmp (bestname, s) != 0) {
+ if (
safe
_strcmp (bestname, s) != 0) {
/* we are adding something to the completion */
/* 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;
}
@@
-523,11
+527,11
@@
int mutt_addr_is_user (ADDRESS * addr)
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));
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",
dprint (5,
(debugfile,
"mail_addr_is_user: but, %s matched by unalternates.\n",