@matheusbsbs / matheus-bagliano / commits / ad9c18f504
Fork 0

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>

Junio C Hamano committed Jun 6, 2006 at 00:05 UTC ad9c18f5045281ddd109c54451f1b4ebfb0d3567
1 file changed +6 -4
git-send-email.perl
+6 -4
@@ -312,16 +312,18 @@ our ($message_id, $cc, %mail, $subject, $reply_to, $references, $message);
312
313 sub extract_valid_address {
314 my $address = shift;
315 + my $local_part_regexp = '[^<>"\s@]+';
316 + my $domain_regexp = '[^.<>"\s@]+\.[^<>"\s@]+';
317
318 # check for a local address:
317 - return $address if ($address =~ /^([\w\-.]+)$/);
319 + return $address if ($address =~ /^($local_part_regexp)$/);
320
321 if ($have_email_valid) {
320 - return Email::Valid->address($address);
322 + return scalar Email::Valid->address($address);
323 } else {
324 # less robust/correct than the monster regexp in Email::Valid,
325 # but still does a 99% job, and one less dependency
324 - $address =~ /([\w\-.]+@[\w\-.]+)/;
326 + $address =~ /($local_part_regexp\@$domain_regexp)/;
327 return $1;
328 }
329 }
@@ -384,7 +386,7 @@ X-Mailer: git-send-email $gitversion
386 defined $pid or die $!;
387 if (!$pid) {
388 exec($smtp_server,'-i',
387 - map { scalar extract_valid_address($_) }
389 + map { extract_valid_address($_) }
390 @recipients) or die $!;
391 }
392 print $sm "$header\n$message";