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
f092a8c
..
cfcd456
100644
(file)
--- a/
alias.c
+++ b/
alias.c
@@
-19,6
+19,7
@@
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
+#include "lib/debug.h"
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
@@
-28,7
+29,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 */
}
@@
-48,11
+49,8
@@
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 */
- dprint (1,
- (debugfile,
- "mutt_expand_aliases_r(): loop in alias found for '%s'\n",
- a->mailbox));
+ if (safe_strcmp (a->mailbox, u->data) == 0) { /* alias already found */
+ debug_print(1, ("loop in alias found for '%s'\n", a->mailbox));
i = 1;
break;
}
i = 1;
break;
}
@@
-85,11
+83,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);
-
-#ifdef EXACT_ADDRESS
- FREE (&a->val);
-#endif
+ str_replace (&a->personal, namebuf);
}
}
}
}
}
}
@@
-398,7
+392,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;
@@
-408,9
+402,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;
}
@@
-487,59
+481,44
@@
int mutt_addr_is_user (ADDRESS * addr)
{
/* NULL address is assumed to be the user. */
if (!addr) {
{
/* NULL address is assumed to be the user. */
if (!addr) {
- d
print (5, (debugfile, "mail_addr_is_user:
yes, NULL address\n"));
+ d
ebug_print(5, ("
yes, NULL address\n"));
return 1;
}
if (!addr->mailbox) {
return 1;
}
if (!addr->mailbox) {
- d
print (5, (debugfile, "mail_addr_is_user:
no, no mailbox\n"));
+ d
ebug_print(5, ("
no, no mailbox\n"));
return 0;
}
if (ascii_strcasecmp (addr->mailbox, Username) == 0) {
return 0;
}
if (ascii_strcasecmp (addr->mailbox, Username) == 0) {
- dprint (5,
- (debugfile, "mail_addr_is_user: yes, %s = %s\n", addr->mailbox,
- Username));
+ debug_print(5, ("yes, %s = %s\n", addr->mailbox, Username));
return 1;
}
if (string_is_address (addr->mailbox, Username, Hostname)) {
return 1;
}
if (string_is_address (addr->mailbox, Username, Hostname)) {
- dprint (5,
- (debugfile, "mail_addr_is_user: yes, %s = %s @ %s \n",
- addr->mailbox, Username, Hostname));
+ debug_print(5, ("yes, %s = %s @ %s \n", addr->mailbox, Username, Hostname));
return 1;
}
if (string_is_address (addr->mailbox, Username, mutt_fqdn (0))) {
return 1;
}
if (string_is_address (addr->mailbox, Username, mutt_fqdn (0))) {
- dprint (5,
- (debugfile, "mail_addr_is_user: yes, %s = %s @ %s \n",
- addr->mailbox, Username, mutt_fqdn (0)));
+ debug_print(5, ("yes, %s = %s @ %s \n", addr->mailbox, Username, mutt_fqdn (0)));
return 1;
}
if (string_is_address (addr->mailbox, Username, mutt_fqdn (1))) {
return 1;
}
if (string_is_address (addr->mailbox, Username, mutt_fqdn (1))) {
- dprint (5,
- (debugfile, "mail_addr_is_user: yes, %s = %s @ %s \n",
- addr->mailbox, Username, mutt_fqdn (1)));
+ debug_print(5, ("yes, %s = %s @ %s \n", addr->mailbox, Username, mutt_fqdn (1)));
return 1;
}
if (From && !ascii_strcasecmp (From->mailbox, addr->mailbox)) {
return 1;
}
if (From && !ascii_strcasecmp (From->mailbox, addr->mailbox)) {
- dprint (5,
- (debugfile, "mail_addr_is_user: yes, %s = %s\n", addr->mailbox,
- From->mailbox));
+ debug_print(5, ("yes, %s = %s\n", addr->mailbox, From->mailbox));
return 1;
}
if (rx_list_match (Alternates, addr->mailbox)) {
return 1;
}
if (rx_list_match (Alternates, addr->mailbox)) {
- dprint (5,
- (debugfile, "mail_addr_is_user: yes, %s matched by alternates.\n",
- addr->mailbox));
+ debug_print(5, ("yes, %s matched by alternates.\n", addr->mailbox));
if (rx_list_match (UnAlternates, addr->mailbox))
if (rx_list_match (UnAlternates, addr->mailbox))
- dprint (5,
- (debugfile,
- "mail_addr_is_user: but, %s matched by unalternates.\n",
- addr->mailbox));
+ debug_print(5, ("but, %s matched by unalternates.\n", addr->mailbox));
else
return 1;
}
else
return 1;
}
- d
print (5, (debugfile, "mail_addr_is_user:
no, all failed.\n"));
+ d
ebug_print(5, ("
no, all failed.\n"));
return 0;
}
return 0;
}