svn commit: r224490 - /spamassassin/trunk/masses/mboxget

[jm...@apache.org]

Author: jm
Date: Sat Jul 23 11:03:27 2005
New Revision: 224490

URL: http://svn.apache.org/viewcvs?rev=224490&view=rev
Log:
minor tweak: mboxget should use proper args parsing with Getopt::Long

Modified:
    spamassassin/trunk/masses/mboxget

Modified: spamassassin/trunk/masses/mboxget
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/mboxget?rev=224490&r1=224489&r2=224490&view=diff
==============================================================================
--- spamassassin/trunk/masses/mboxget (original)
+++ spamassassin/trunk/masses/mboxget Sat Jul 23 11:03:27 2005
@@ -31,29 +31,25 @@
 
 sub mywarn;
 
-my $annotate = 1;
-while ($#ARGV >= 0) {
-  $_ = $ARGV[0]; shift;
-  if ($_ eq '-noannotate') { $annotate = 0; }
-  else { unshift @ARGV, $_; last; }
-}
+use Getopt::Long;
+use vars qw($opt_noannotate);
+GetOptions("noannotate");
 
-my @inputs;
-push @inputs, @ARGV;
+my $annotate = ($opt_noannotate ? 0 : 1);
 
-if (!@inputs) {
-  while (<STDIN>) {
-    s/^[^\s:]+://;  # filenames, from "grep foo *"
+my @inputs = @ARGV;
 
-    if (/^[Y\.]\s+-?\d+\s+(\S+)\s+\S+/) {
-      # mass-check format
-      handle_input($1);
-    }
-    else {
-      next if /^#/;
-      chomp;
-      handle_input($_);
-    }
+while (<>) {
+  s/^[^\s:]+://;  # filenames, from "grep foo *"
+
+  if (/^[Y\.]\s+-?\d+\s+(\S+)\s+\S+/) {
+    # mass-check format
+    handle_input($1);
+  }
+  else {
+    next if /^#/;
+    chomp;
+    handle_input($_);
   }
 }
 exit;