From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Wong Subject: [PATCH 3/4] send-email: lazy-load Email::Valid and make it optional Date: Sat, 25 Mar 2006 02:43:31 -0800 Message-ID: <11432834111972-git-send-email-normalperson@yhbt.net> References: <11432834101430-git-send-email-normalperson@yhbt.net> Reply-To: Eric Wong Cc: git , Ryan Anderson , Greg KH , Eric Wong X-From: git-owner@vger.kernel.org Sat Mar 25 11:44:32 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FN6Fv-00016M-HT for gcvg-git@gmane.org; Sat, 25 Mar 2006 11:44:27 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751165AbWCYKoC (ORCPT ); Sat, 25 Mar 2006 05:44:02 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751161AbWCYKoB (ORCPT ); Sat, 25 Mar 2006 05:44:01 -0500 Received: from hand.yhbt.net ([66.150.188.102]:20104 "EHLO hand.yhbt.net") by vger.kernel.org with ESMTP id S1751162AbWCYKn6 (ORCPT ); Sat, 25 Mar 2006 05:43:58 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by hand.yhbt.net (Postfix) with ESMTP id 241B47DC022; Sat, 25 Mar 2006 02:43:58 -0800 (PST) To: Junio C Hamano X-Mailer: git-send-email In-Reply-To: <11432834101430-git-send-email-normalperson@yhbt.net> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: It's not installed on enough machines, and is overkill most of the time. We'll fallback to a very basic regexp (that is a looser variant of what Email::Valid allows) just in case, but nothing like the monster regexp Email::Valid has to offer :) Signed-off-by: Eric Wong --- git-send-email.perl | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) 140eaf9b9d438ea489e6c72e2148feb3e355aea8 diff --git a/git-send-email.perl b/git-send-email.perl index 5e08817..73bba19 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -22,12 +22,12 @@ use Term::ReadLine; 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/; +my $have_email_valid = eval { require Email::Valid or undef }; my $smtp; sub unique_email_list(@); @@ -250,6 +250,16 @@ EOT # 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. @@ -259,7 +269,7 @@ our ($message_id, $cc, %mail, $subject, # 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 @@ -412,7 +422,7 @@ sub unique_email_list(@) { my @emails; foreach my $entry (@_) { - my $clean = Email::Valid->address($entry); + my $clean = extract_valid_address($entry); next if $seen{$clean}++; push @emails, $entry; } -- 1.2.4.gb622a