kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

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>
maint
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 { sub extract_valid_address {
my $address = shift; my $address = shift;
my $local_part_regexp = '[^<>"\s@]+';
my $domain_regexp = '[^.<>"\s@]+\.[^<>"\s@]+';


# check for a local address: # check for a local address:
return $address if ($address =~ /^([\w\-.]+)$/); return $address if ($address =~ /^($local_part_regexp)$/);


if ($have_email_valid) { if ($have_email_valid) {
return Email::Valid->address($address); return scalar Email::Valid->address($address);
} else { } else {
# less robust/correct than the monster regexp in Email::Valid, # less robust/correct than the monster regexp in Email::Valid,
# but still does a 99% job, and one less dependency # but still does a 99% job, and one less dependency
$address =~ /([\w\-.]+@[\w\-.]+)/; $address =~ /($local_part_regexp\@$domain_regexp)/;
return $1; return $1;
} }
} }
@ -384,7 +386,7 @@ X-Mailer: git-send-email $gitversion
defined $pid or die $!; defined $pid or die $!;
if (!$pid) { if (!$pid) {
exec($smtp_server,'-i', exec($smtp_server,'-i',
map { scalar extract_valid_address($_) } map { extract_valid_address($_) }
@recipients) or die $!; @recipients) or die $!;
} }
print $sm "$header\n$message"; print $sm "$header\n$message";