undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'vb/sendemail'

Browse Source 
* vb/sendemail:
  send-email: a bit more careful domain regexp.
  send-email: be more lenient and just catch obvious mistakes.
  Cleanup git-send-email.perl:extract_valid_email
This commit is contained in:
Junio C Hamano 2006-06-06 16:42:33 -07:00
commit ad0e0b0a31
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git-send-email.perl
View File

@ -312,20 +312,19 @@ our ($message_id, $cc, %mail, $subject, $reply_to, $references, $message);
sub extract_valid_address {
my $address = shift;
my $local_part_regexp = '[^<>"\s@]+';
my $domain_regexp = '[^.<>"\s@]+(?:\.[^.<>"\s@]+)+';
# check for a local address:
return $address if ($address =~ /^([\w\-]+)$/);
return $address if ($address =~ /^($local_part_regexp)$/);
if ($have_email_valid) {
return Email::Valid->address($address);
return scalar Email::Valid->address($address);
} else {
# less robust/correct than the monster regexp in Email::Valid,
# but still does a 99% job, and one less dependency
my $cleaned_address;
if ($address =~ /([^\"<>\s]+@[^<>\s]+)/) {
$cleaned_address = $1;
}
return $cleaned_address;
$address =~ /($local_part_regexp\@$domain_regexp)/;
return $1;
}
}
@ -387,7 +386,7 @@ X-Mailer: git-send-email $gitversion
defined $pid or die $!;
if (!$pid) {
exec($smtp_server,'-i',
map { scalar extract_valid_address($_) }
map { extract_valid_address($_) }
@recipients) or die $!;
}
print $sm "$header\n$message";