X-Git-Url: http://gitweb.michael.orlitzky.com/?p=valtz.git;a=blobdiff_plain;f=valtz;h=1b69a73dae233c2173f1e2d2273b62ac587e7c54;hp=12d22c937e14542e5742d111cc538c7370e07dae;hb=b34754a96be1e379c633f7a2ede92d6b2e131d18;hpb=f54a7004818905702fdcac7b69e9795a3ea67ce4

diff --git a/valtz b/valtz
index 12d22c9..1b69a73 100755
--- a/valtz
+++ b/valtz
@@ -1,10 +1,8 @@
 #!/usr/bin/perl
 #
-# $Id: valtz,v 0.7 2003/07/10 16:39:30 magnus Exp $
-#
 # <BSD-license>
 #
-# Copyright (c) 2003, Magnus Bodin, <magnus@bodin.org>, http://x42.com
+# Copyright (c) 2020, the valtz authors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -18,9 +16,9 @@
 # notice, this list of conditions and the following disclaimer in the
 # documentation and/or other materials provided with the distribution.
 #
-# Neither the name of Magnus Bodin, x42.com nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
+# Neither the name of valtz nor the names of its contributors may be
+# used to endorse or promote products derived from this software
+# without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -48,12 +46,8 @@ my $VERSION = '0.8';
 
 $| = 1;
 my %opt;
-getopts('?fFhHiIqrRstT:', \%opt);
-
+getopts('?fFhHiIqrRtT:', \%opt);
 
-my $FILESUFFIXREGEXP = '('.join('|', qw/
-        ,v ~ .bak .log .old .swp .tmp
-    /).')$';
 
 # Validation errors
 my $verrs_total = 0;
@@ -729,11 +723,6 @@ sub do_filterfile ($$)
     }
     for my $zonefile (@zonefiles)
     {
-        unless ($opt{s})
-        {
-            next if $zonefile =~ /$FILESUFFIXREGEXP/i;
-        }
-
         my $info = 0;
     my $filehandle = \*STDIN;
     my $fopen = 1;
@@ -902,9 +891,9 @@ valtz $VERSION - validate tinydns-data files
 Usage:
  $0 [-r] [-R] [-i] tinydns-file1 [tinydns-file2...]
 
- $0 [-HiIqrRst] [-T types] -f tinydns-file1 [tinydns-file2 ...]
+ $0 [-HiIqrRt] [-T types] -f tinydns-file1 [tinydns-file2 ...]
 
- $0 valtz [-fHiIqrRst] [-T types] -F filter-file1 [filter-file2 ...]
+ $0 valtz [-fHiIqrRt] [-T types] -F filter-file1 [filter-file2 ...]
 
 Flags:
  -h           print usage information
@@ -915,7 +904,6 @@ Flags:
  -i           allow "ip" fields to be empty
  -I           include rejected lines as comments (filtering only)
  -q           don't print valid lines to standard out (filtering only)
- -s           don't skip temporary and backup files
  -t           don't ignore comment lines (filtering only)
  -T <types>   allow additional record types (advanced filtering only)
 
@@ -956,11 +944,6 @@ else
 
     for my $zonefile (sort @{$files})
     {
-        unless ($opt{s})
-        {
-            next if $zonefile =~ /$FILESUFFIXREGEXP/i;
-        }
-
     my $filehandle = \*STDIN;
     my $fopen = 1;
     if ($zonefile ne '-')