From: Horst von Brand Date: Mon, 29 May 2006 21:09:42 GMT Subject: Re: [PATCH] git-send-email.perl extract_valid_address issue Message-ID: <200605292109.k4TL9g7E014263@laptop11.inf.utfsm.cl> In-Reply-To: Fix regexps to better match email addresses if Email::Valid isn't present Make it return the address on match containing a @ Signed-off-by: Horst H. von Brand --- git-send-email.perl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 312a4ea..6e39f2f 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -309,14 +309,14 @@ sub extract_valid_address { my $address = shift; # check for a local address: - return $address if ($address =~ /^([\w\-]+)$/); + return $address if ($address =~ /^([\w\-.]+)$/); 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]+)/); + return ($address =~ /([\w\-.]+@[\w\-.]+)/) ? $1 : undef; } } -- 1.3.3.g0f0ac