edmail: Allow to add "good" recipient addresses while skipping "bad" ones

1 files changed, 16 insertions, 3 deletions

diff --git a/quilt/scripts/edmail.in b/quilt/scripts/edmail.in
index 140355b..d0e8ca6 100644
--- a/quilt/scripts/edmail.in
+++ b/quilt/scripts/edmail.in
@@ -36,6 +36,11 @@ sub _($) {
     return gettext(shift);
 }
 
+my $special = '()<>\[\]:;@\\,"';  # special characters
+my $special_dot = "$special.";  # special characters + dot
+
+sub check_recipient($);
+
 my (%append_name, %append_value, $remove_empty_headers, %remove_header,
     %extract_recipients_from, %replace_name, %replace_value, $charset);
 GetOptions('add-recipient=s%' =>
@@ -43,6 +48,17 @@ GetOptions('add-recipient=s%' =>
 	$append_name{lc $_[1]} = $_[1];
 	$append_value{lc $_[1]} .= ",\n " . $_[2];
     },
+    'add-good-recipient=s%' =>
+    sub {
+	eval { check_recipient($_[2]) };
+	if ($@) {
+		chomp $@;
+		print STDERR "$@; skipping\n";
+	} else {
+		$append_name{lc $_[1]} = $_[1];
+		$append_value{lc $_[1]} .= ",\n " . $_[2];
+	}
+    },
     'remove-header=s' => sub { $remove_header{lc $_[1]}++ },
     'remove-empty-headers' => \$remove_empty_headers,
     'replace-header=s%' =>
@@ -61,9 +77,6 @@ sub encode_header($) {
     return "=?$charset?q?$word?=";
 }
 
-my $special = '()<>\[\]:;@\\,"';  # special characters
-my $special_dot = "$special.";  # special characters + dot
-
 # Check for a valid display name
 sub check_display_name($) {
     my ($display) = @_;