INN commit: trunk (4 files)

INN Commit Russ_Allbery at isc.org
Sat Jan 17 08:15:33 UTC 2009


    Date: Saturday, January 17, 2009 @ 00:15:31
  Author: iulius
Revision: 8290

Use Getopt::Std instead of getopts.pl (which is not maintained
by Perl and produces spurious warnings).

Thanks to William Kronert for the report.

close #123

Modified:
  trunk/frontends/scanspool.in
  trunk/innfeed/procbatch.in
  trunk/innfeed/testListener.pl
  trunk/scripts/innmail.in

-------------------------+
 frontends/scanspool.in  |    4 ++--
 innfeed/procbatch.in    |    4 ++--
 innfeed/testListener.pl |    4 ++--
 scripts/innmail.in      |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

Modified: frontends/scanspool.in
===================================================================
--- frontends/scanspool.in	2009-01-12 02:45:46 UTC (rev 8289)
+++ frontends/scanspool.in	2009-01-17 08:15:31 UTC (rev 8290)
@@ -96,7 +96,7 @@
 
 # perl requirements
 #
-require "getopts.pl";
+use Getopt::Std;
 
 use vars qw($opt_c);
 
@@ -117,7 +117,7 @@
 
 # parse args
 #
-&Getopts("a:s:vcn");
+getopts("a:s:vcn");
 $active = $opt_a if (defined($opt_a));
 $spool = $opt_s if (defined($opt_s));
 

Modified: innfeed/procbatch.in
===================================================================
--- innfeed/procbatch.in	2009-01-12 02:45:46 UTC (rev 8289)
+++ innfeed/procbatch.in	2009-01-17 08:15:31 UTC (rev 8290)
@@ -29,7 +29,7 @@
 
 $0 =~ s!.*/!! ;
 
-require 'getopts.pl' ;
+use Getopt::Std;
 
 $usage = "$0 [ -q ][ -v ][ -u ][ -e host ][ -d dir ][ -c [ -s dir ]][ -m [-t dir ]] inn-batchfile\n
   -e host    to process on entries for only that host
@@ -62,7 +62,7 @@
 
 $opt_u = $opt_h = "";  # shut up, perl -w
 $missing = 0;
-&Getopts ("he:t:s:d:cvumq") || die $usage ;
+getopts ("he:t:s:d:cvumq") || die $usage ;
 
 die $usage if ( $opt_h ) ;
 die "Cannot specify both -q and -v\n\n" . $usage if ($opt_q && $opt_v);

Modified: innfeed/testListener.pl
===================================================================
--- innfeed/testListener.pl	2009-01-12 02:45:46 UTC (rev 8289)
+++ innfeed/testListener.pl	2009-01-17 08:15:31 UTC (rev 8290)
@@ -18,7 +18,7 @@
 
 $0 =~ s!.*/!! ;
 
-require 'getopts.pl' ;
+use Getopt::Std;
 
 $usage = "$0 [ -a -b name -d directory -c count -t sleep-amt -r -u ] peers\n" .
     "  -a is for duplicate article id's periodically\n" .
@@ -29,7 +29,7 @@
     "  -t is the number of seconds to sleep between each article.\n" .
     "  -r is to have articles be created in NNTP ready format\n" ;
 
-&Getopts ("a:b:c:d:t:rl:h:") || die $usage ;
+getopts ("a:b:c:d:t:rl:h:") || die $usage ;
 
 die $usage if $opt_h ;
 $total = $opt_c ;

Modified: scripts/innmail.in
===================================================================
--- scripts/innmail.in	2009-01-12 02:45:46 UTC (rev 8289)
+++ scripts/innmail.in	2009-01-17 08:15:31 UTC (rev 8290)
@@ -13,7 +13,7 @@
 $0 =~ s!.*/!! ;
 
 require 5.001 ;
-require 'getopts.pl' ;
+use Getopt::Std;
 use vars qw($opt_h);
 
 die "$0: No \$INN::Config::mta  variable defined.\n" 
@@ -26,7 +26,7 @@
 $usage = "usage: $0 -s subject addresses\n\n" .
     "Reads stdin for message body\n" ;
 
-&Getopts ("s:h") || die $usage ;
+getopts ("s:h") || die $usage ;
 
 die $usage if $opt_h ;
 




More information about the inn-committers mailing list