Changeset 5019:25cbd5588d35 for alias.c
Legend:
- Unmodified
- Added
- Removed
-
alias.c
r4343 r5019 535 535 if (!addr) 536 536 { 537 dprint (5, (debugfile, "m ail_addr_is_user: yes, NULL address\n"));537 dprint (5, (debugfile, "mutt_addr_is_user: yes, NULL address\n")); 538 538 return 1; 539 539 } 540 540 if (!addr->mailbox) 541 541 { 542 dprint (5, (debugfile, "m ail_addr_is_user: no, no mailbox\n"));542 dprint (5, (debugfile, "mutt_addr_is_user: no, no mailbox\n")); 543 543 return 0; 544 544 } … … 546 546 if (ascii_strcasecmp (addr->mailbox, Username) == 0) 547 547 { 548 dprint (5, (debugfile, "m ail_addr_is_user: yes, %s = %s\n", addr->mailbox, Username));548 dprint (5, (debugfile, "mutt_addr_is_user: yes, %s = %s\n", addr->mailbox, Username)); 549 549 return 1; 550 550 } 551 551 if (string_is_address(addr->mailbox, Username, Hostname)) 552 552 { 553 dprint (5, (debugfile, "m ail_addr_is_user: yes, %s = %s @ %s \n", addr->mailbox, Username, Hostname));553 dprint (5, (debugfile, "mutt_addr_is_user: yes, %s = %s @ %s \n", addr->mailbox, Username, Hostname)); 554 554 return 1; 555 555 } 556 556 if (string_is_address(addr->mailbox, Username, mutt_fqdn(0))) 557 557 { 558 dprint (5, (debugfile, "m ail_addr_is_user: yes, %s = %s @ %s \n", addr->mailbox, Username, mutt_fqdn (0)));558 dprint (5, (debugfile, "mutt_addr_is_user: yes, %s = %s @ %s \n", addr->mailbox, Username, mutt_fqdn (0))); 559 559 return 1; 560 560 } 561 561 if (string_is_address(addr->mailbox, Username, mutt_fqdn(1))) 562 562 { 563 dprint (5, (debugfile, "m ail_addr_is_user: yes, %s = %s @ %s \n", addr->mailbox, Username, mutt_fqdn (1)));563 dprint (5, (debugfile, "mutt_addr_is_user: yes, %s = %s @ %s \n", addr->mailbox, Username, mutt_fqdn (1))); 564 564 return 1; 565 565 } … … 567 567 if (From && !ascii_strcasecmp (From->mailbox, addr->mailbox)) 568 568 { 569 dprint (5, (debugfile, "m ail_addr_is_user: yes, %s = %s\n", addr->mailbox, From->mailbox));569 dprint (5, (debugfile, "mutt_addr_is_user: yes, %s = %s\n", addr->mailbox, From->mailbox)); 570 570 return 1; 571 571 } … … 573 573 if (mutt_match_rx_list (addr->mailbox, Alternates)) 574 574 { 575 dprint (5, (debugfile, "m ail_addr_is_user: yes, %s matched by alternates.\n", addr->mailbox));575 dprint (5, (debugfile, "mutt_addr_is_user: yes, %s matched by alternates.\n", addr->mailbox)); 576 576 if (mutt_match_rx_list (addr->mailbox, UnAlternates)) 577 dprint (5, (debugfile, "m ail_addr_is_user: but, %s matched by unalternates.\n", addr->mailbox));577 dprint (5, (debugfile, "mutt_addr_is_user: but, %s matched by unalternates.\n", addr->mailbox)); 578 578 else 579 579 return 1; 580 580 } 581 581 582 dprint (5, (debugfile, "m ail_addr_is_user: no, all failed.\n"));582 dprint (5, (debugfile, "mutt_addr_is_user: no, all failed.\n")); 583 583 return 0; 584 584 }
