From: Julien Danjou <julien@danjou.info>
Date: Tue, 10 Aug 2010 14:27:44 +0000 (+0200)
Subject: Make --to a multivalue option
X-Git-Tag: 0.2~3
X-Git-Url: http://git.home-dn.net/?p=manu%2Fsmtpt.git;a=commitdiff_plain;h=4ee7f678bc5e7e1f11599623f990e6bc3e566bbe

Make --to a multivalue option

Signed-off-by: Julien Danjou <julien@danjou.info>
---

diff --git a/smtpt b/smtpt
index 1781498..3d338b7 100755
--- a/smtpt
+++ b/smtpt
@@ -40,7 +40,7 @@ my %sample;
 # Spam sample email
 $sample{spam} = 'Subject: Test spam mail (GTUBE)
 From: Sender <{FROM}>
-To: Recipient <{TO}>
+To: {TO}
 MIME-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
@@ -65,7 +65,7 @@ You should send this test mail from an account outside of your network.
 # Nospam/novirus sample email
 $sample{normal} = 'Subject: Test mail nospam/novirus
 From: Sender <{FROM}>
-To: Recipient <{TO}>
+To: {TO}
 MIME-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
@@ -76,7 +76,7 @@ Essai  nospam/novirus
 
 # Virus sample email
 $sample{virus} = 'From: Sender <{FROM}>
-To: Recipient <{TO}>
+To: {TO}
 Subject: Test virus
 Mime-Version: 1.0
 Content-Type: multipart/mixed; boundary="C7zPtVaVf+AK4Oqc"
@@ -149,7 +149,7 @@ sub main {
     my $appconfig = AppConfig->new(
         'host=s', 
         'from=s', 
-        'to=s', 
+        'to=s@',
         'spam=s', 
         'virus=s', 
         'normal=s', 
@@ -171,7 +171,8 @@ sub main {
 
     my $host = $opt{host};
     my $from = $opt{from};
-    my $to = $opt{to};
+    my @to = @{$opt{to}};
+    my $to_formatted = join(", ", @to);
     $count{spam} = $opt{spam};
     $count{virus} = $opt{virus};
     $count{normal} = $opt{normal};
@@ -202,13 +203,13 @@ sub main {
     foreach my $type (keys%count) {
         my $i = 0;
         while ($i < $count{$type}) {
-            print "Sending: $from -> $to, $type\n";
+            print "Sending $type: $from -> $to_formatted\n";
             $smtp->mail($from) or error("From failed: $!\n");
-            $smtp->to($to) or error("To failed: $!\n");
+            $smtp->to(@to) or error("To failed: $!\n");
             $smtp->data() or error("Data failed: $!\n");
             my $sent_size = 0;
             my $body = $sample{$type};
-            $body =~ s/{TO}/$to/g;
+            $body =~ s/{TO}/$to_formatted/g;
             $body =~ s/{FROM}/$from/g;
 	    # Disable special virus mangling (needed for letting people using an http AV download this toool ;))
             $body =~ s/{DEACTIVATED}//g;