mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-20 16:34:04 +01:00
Code

send-email: be more lenient and just catch obvious mistakes.

Browse Source 
This cleans up the pattern matching subroutine by introducing
two variables to hold regexp to approximately match local-part
and domain in the e-mail address.  It is meant to catch obvious
mistakes with a cheap check.

The patch also moves "scalar" to force Email::Valid->address()
to work in !wantarray environment to extract_valid_address;
earlier it was in the caller of the subroutine, which was way
too error prone.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-06-06 00:05:56 -07:00
parent e96fd30553
commit ad9c18f504
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-send-email.perl
View File

@ -312,16 +312,18 @@ 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
$address =~ /([\w\-.]+@[\w\-.]+)/;
$address =~ /($local_part_regexp\@$domain_regexp)/;
return $1;
}
}
@ -384,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";