update copyrights for 2018

[public-inbox.git] / lib / PublicInbox / Address.pm

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index 772adedb29b3ed1546a647181a31609e5f3d7766..f334adeac02d0b797d5d29c715a0ec49da049c48 100644 (file)
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 package PublicInbox::Address;
 use strict;
@@ -7,20 +7,21 @@ use warnings;
 # very loose regexes, here.  We don't need RFC-compliance,
 # just enough to make thing sanely displayable and pass to git
 
-sub emails { ($_[0] =~ /([^<\s,]+\@[^>\s,]+)/g) }
+sub emails {
+       ($_[0] =~ /([\w\.\+=\-]+\@[\w\.\-]+)>?\s*(?:\(.*?\))?(?:,\s*|\z)/g)
+}
 
-sub from_name {
-       my ($val) = @_;
-       my $name = $val;
-       $name =~ s/\s*\S+\@\S+\s*\z//;
-       if ($name !~ /\S/ || $name =~ /[<>]/) { # git does not like [<>]
-               ($name) = emails($val);
-               $name =~ s/\@.*//;
-       }
-       $name =~ tr/\r\n\t/ /;
-       $name =~ s/\A['"\s]*//;
-       $name =~ s/['"\s]*\z//;
-       $name;
+sub names {
+       map {
+               tr/\r\n\t/ /;
+               s/\s*<([^<]+)\z//;
+               my $e = $1;
+               s/\A['"\s]*//;
+               s/['"\s]*\z//;
+               $e = $_ =~ /\S/ ? $_ : $e;
+               $e =~ s/\@\S+\z//;
+               $e;
+       } split(/\@+[\w\.\-]+>?\s*(?:\(.*?\))?(?:,\s*|\z)/, $_[0]);
 }
 
 1;