projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
alias.c
diff --git
a/alias.c
b/alias.c
index
508e24b
..
5d83357
100644
(file)
--- a/
alias.c
+++ b/
alias.c
@@
-16,6
+16,10
@@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "mutt.h"
#include "mutt_regex.h"
#include "mutt_curses.h"
#include "mutt.h"
#include "mutt_regex.h"
#include "mutt_curses.h"
@@
-327,7
+331,7
@@
retry_name:
if (mutt_get_field (_("Save to file: "), buf, sizeof (buf), M_FILE) != 0)
return;
mutt_expand_path (buf, sizeof (buf));
if (mutt_get_field (_("Save to file: "), buf, sizeof (buf), M_FILE) != 0)
return;
mutt_expand_path (buf, sizeof (buf));
- if ((rc = fopen (buf, "a")))
+ if ((rc =
safe_
fopen (buf, "a")))
{
if (mutt_check_alias_name (new->name, NULL))
mutt_quote_filename (buf, sizeof (buf), new->name);
{
if (mutt_check_alias_name (new->name, NULL))
mutt_quote_filename (buf, sizeof (buf), new->name);
@@
-569,7
+573,10
@@
int mutt_addr_is_user (ADDRESS *addr)
if (mutt_match_rx_list (addr->mailbox, Alternates))
{
dprint (5, (debugfile, "mail_addr_is_user: yes, %s matched by alternates.\n", addr->mailbox));
if (mutt_match_rx_list (addr->mailbox, Alternates))
{
dprint (5, (debugfile, "mail_addr_is_user: yes, %s matched by alternates.\n", addr->mailbox));
- return 1;
+ if (mutt_match_rx_list (addr->mailbox, UnAlternates))
+ dprint (5, (debugfile, "mail_addr_is_user: but, %s matched by unalternates.\n", addr->mailbox));
+ else
+ return 1;
}
dprint (5, (debugfile, "mail_addr_is_user: no, all failed.\n"));
}
dprint (5, (debugfile, "mail_addr_is_user: no, all failed.\n"));