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
a41c8d8
..
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>
@@
-49,10
+50,7
@@
static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
i = 0;
for (u = *expn; u; u = u->next) {
if (safe_strcmp (a->mailbox, u->data) == 0) { /* alias already found */
i = 0;
for (u = *expn; u; u = u->next) {
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",
- a->mailbox));
+ debug_print(1, ("loop in alias found for '%s'\n", a->mailbox));
i = 1;
break;
}
i = 1;
break;
}
@@
-86,10
+84,6
@@
static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
mutt_gecos_name (namebuf, sizeof (namebuf), pw);
str_replace (&a->personal, namebuf);
mutt_gecos_name (namebuf, sizeof (namebuf), pw);
str_replace (&a->personal, namebuf);
-
-#ifdef EXACT_ADDRESS
- FREE (&a->val);
-#endif
}
}
}
}
}
}
@@
-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;
}