commit - 1dd30c4efd6f217314dd6998f9e7c3953920ff24
commit + fe5554768a6798f535374d18fe89d06f2d5968df
blob - 720f80d6e3c1458712b9932141900de7d6172eaf
blob + ee90964680dca0ec46bde9ea8d3d1c955ae6d42f
--- addrcache.pl
+++ addrcache.pl
@@ -9,12 +9,11 @@ use Email::Address::XS;
 
 my $raw_hdr = do { local $/; <> };
 my $hdr = Email::MIME->new($raw_hdr);
-my @addrs;
+my @addrs = map { Email::Address::XS->parse($_) }
+	grep { defined && $_ ne '' }
+	map { $hdr->header($_) }
+	qw(To From Cc);
 
-push @addrs, Email::Address::XS->parse($hdr->header('To'));
-push @addrs, Email::Address::XS->parse($hdr->header('From'));
-push @addrs, Email::Address::XS->parse($hdr->header('Cc'));
-
 my $db_dir = "$ENV{HOME}/.local/share/addrutils/";
 my $db = "addrs.db";
 my $dsn = "dbi:SQLite:dbname=$db_dir/$db";