send-email: lazy-load Email::Valid and make it optional

It's not installed on enough machines, and is overkill most of
the time.  We'll fallback to a very basic regexp just in case,
but nothing like the monster regexp Email::Valid has to offer :)

Small cleanup from Merlyn.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-send-email.perl b/git-send-email.perl
index d2af98ac0c9645494ef484ee91cb853840cb630f..ecfa347b85bb6c3c5e6b1b3a1f83ac1acb069b66 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -22,12 +22,12 @@
 use Getopt::Long;
 use Data::Dumper;
 use Net::SMTP;
 use Getopt::Long;
 use Data::Dumper;
 use Net::SMTP;

-use Email::Valid;

 
 # most mail servers generate the Date: header, but not all...
 $ENV{LC_ALL} = 'C';
 use POSIX qw/strftime/;
 
 
 # most mail servers generate the Date: header, but not all...
 $ENV{LC_ALL} = 'C';
 use POSIX qw/strftime/;
 

+my $have_email_valid = eval { require Email::Valid; 1 };

 my $smtp;
 
 sub unique_email_list(@);
 my $smtp;
 
 sub unique_email_list(@);


@@ -250,6 +250,16 @@ sub gitvar_ident {
 # Variables we set as part of the loop over files
 our ($message_id, $cc, %mail, $subject, $reply_to, $message);
 
 # Variables we set as part of the loop over files
 our ($message_id, $cc, %mail, $subject, $reply_to, $message);
 

+sub extract_valid_address {
+       my $address = shift;
+       if ($have_email_valid) {
+               return 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
+               return ($address =~ /([^\"<>\s]+@[^<>\s]+)/);
+       }
+}

 
 # Usually don't need to change anything below here.
 
 
 # Usually don't need to change anything below here.
 


@@ -259,7 +269,7 @@ sub gitvar_ident {
 # 1 second since the last time we were called.
 
 # We'll setup a template for the message id, using the "from" address:
 # 1 second since the last time we were called.
 
 # We'll setup a template for the message id, using the "from" address:

-my $message_id_from = Email::Valid->address($from);
+my $message_id_from = extract_valid_address($from);

 my $message_id_template = "<%s-git-send-email-$message_id_from>";
 
 sub make_message_id
 my $message_id_template = "<%s-git-send-email-$message_id_from>";
 
 sub make_message_id


@@ -413,7 +423,7 @@ (@)
        my @emails;
 
        foreach my $entry (@_) {
        my @emails;
 
        foreach my $entry (@_) {

-               my $clean = Email::Valid->address($entry);
+               my $clean = extract_valid_address($entry);

                next if $seen{$clean}++;
                push @emails, $entry;
        }
                next if $seen{$clean}++;
                push @emails, $entry;
        }