Remove Perl 4 sigils (PBP)

This commit is contained in:
Dan Church 2023-09-04 10:08:00 -05:00
parent dc38b1a376
commit 41ba29d218
Signed by: h3xx
GPG key ID: EA2BF379CD2CDBD0

View file

@ -25,7 +25,7 @@ my $skip = 0;
my $removed_allowed = 0; my $removed_allowed = 0;
sub add_domain_list { sub add_domain_list {
my $file = shift; my $file = shift;
foreach my $line (&read_stripped($file)) { foreach my $line (read_stripped($file)) {
my $domain = lc $line; my $domain = lc $line;
++$dupes if defined $domains{$domain}; ++$dupes if defined $domains{$domain};
$domains{$domain} = 1; $domains{$domain} = 1;
@ -34,7 +34,7 @@ sub add_domain_list {
sub add_host_file { sub add_host_file {
my $file = shift; my $file = shift;
foreach my $line (&read_stripped($file)) { foreach my $line (read_stripped($file)) {
my @parts = split /\s+/, $line; my @parts = split /\s+/, $line;
die "Malformed line in $file: $line; @parts" die "Malformed line in $file: $line; @parts"
unless @parts > 1; unless @parts > 1;
@ -71,7 +71,7 @@ MAIN: {
my $block_ip = '0.0.0.0 ::'; my $block_ip = '0.0.0.0 ::';
my $workdir = $FindBin::RealBin; my $workdir = $FindBin::RealBin;
unless (&GetOptions( unless (GetOptions(
'out=s' => \$out, 'out=s' => \$out,
'O=s' => \$out, 'O=s' => \$out,
'i=s' => \$block_ip, 'i=s' => \$block_ip,
@ -85,16 +85,16 @@ MAIN: {
my @allow_lists = glob "$workdir/allowlists/*.domains"; my @allow_lists = glob "$workdir/allowlists/*.domains";
foreach my $listfile (@domain_lists) { foreach my $listfile (@domain_lists) {
&add_domain_list($listfile); add_domain_list($listfile);
} }
foreach my $hostfile (@hosts_lists) { foreach my $hostfile (@hosts_lists) {
&add_host_file($hostfile); add_host_file($hostfile);
} }
# Apply allowlists # Apply allowlists
my @allow_domains; my @allow_domains;
foreach my $allowlist (@allow_lists) { foreach my $allowlist (@allow_lists) {
push @allow_domains, &read_stripped($allowlist); push @allow_domains, read_stripped($allowlist);
} }
my $before = %domains; my $before = %domains;
delete %domains{@allow_domains}; delete %domains{@allow_domains};