Merge branch 'vb/sendemail' into next

diff --git a/git-send-email.perl b/git-send-email.perl
index 0e368fff0cd6158108012b53eeb88496cc0a0632..700d0c3e1506599b12fd8093021066314e1c0e8d 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -21,7 +21,6 @@
 use Term::ReadLine;
 use Getopt::Long;
 use Data::Dumper;
-use Net::SMTP;
 
 # most mail servers generate the Date: header, but not all...
 $ENV{LC_ALL} = 'C';
@@ -313,20 +312,19 @@ sub expand_aliases {
 
 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;
        }
 }
 
@@ -388,12 +386,13 @@ sub send_message
                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";
                close $sm or die $?;
        } else {
+               require Net::SMTP;
                $smtp ||= Net::SMTP->new( $smtp_server );
                $smtp->mail( $from ) or die $smtp->message;
                $smtp->to( @recipients ) or die $smtp->message;