Make the small perl programs uniform in style

7 files changed, 38 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index 8c33c61..d71d81d 100644
--- a/Makefile
+++ b/Makefile
@@ -70,25 +70,25 @@ mkpasswd: $(mkpasswd_OBJECTS)
 
 ##############################################################################
 version.h: debian/changelog make_version_h.pl
-	$(PERL) -w make_version_h.pl $< > $@
+	$(PERL) make_version_h.pl $< > $@
 
 as_del.h: as_del_list make_as_del.pl
-	$(PERL) -w make_as_del.pl < $< > $@
+	$(PERL) make_as_del.pl < $< > $@
 
 as32_del.h: as32_del_list make_as32_del.pl
-	$(PERL) -w make_as32_del.pl < $< > $@
+	$(PERL) make_as32_del.pl < $< > $@
 
 ip_del.h: ip_del_list make_ip_del.pl
-	$(PERL) -w make_ip_del.pl < $< > $@
+	$(PERL) make_ip_del.pl < $< > $@
 
 ip6_del.h: ip6_del_list make_ip6_del.pl
-	$(PERL) -w make_ip6_del.pl < $< > $@
+	$(PERL) make_ip6_del.pl < $< > $@
 
 tld_serv.h: tld_serv_list make_tld_serv.pl
-	$(PERL) -w make_tld_serv.pl < $< > $@
+	$(PERL) make_tld_serv.pl < $< > $@
 
 servers_charset.h: servers_charset_list make_servers_charset.pl
-	$(PERL) -w make_servers_charset.pl < $< > $@
+	$(PERL) make_servers_charset.pl < $< > $@
 
 ##############################################################################
 install: install-whois install-mkpasswd install-pos
diff --git a/make_as32_del.pl b/make_as32_del.pl
index 663e7f6..6382679 100755
--- a/make_as32_del.pl
+++ b/make_as32_del.pl
@@ -3,10 +3,10 @@
 use warnings;
 use strict;
 
-while (<STDIN>) {
+while (<>) {
 	chomp;
-	s/^\s*(.+)\s*$/$1/;
-	s/\s*#.*$//;
+	s/#.*$//;
+	s/^\s+//; s/\s+$//;
 	next if /^$/;
 
 	my ($fh, $fl, $lh, $ll, $s, $f, $l);
@@ -16,10 +16,10 @@ while (<STDIN>) {
 		$l = ($lh << 16) + $ll;
 
 		my $server = ($s =~ /\./) ? $s : "whois.$s.net";
-		print qq({ $f, $l,\t"$server" },\t/* $fh.$fl $lh.$ll */\n);
+		print qq|{ ${f}u, ${l}u,\t"$server" },\t/* $fh.$fl $lh.$ll */\n|;
 	} elsif (($f, $l, $s) = /^(\d+)\s+(\d+)\s+([\w\.-]+)$/) {
 		my $server = ($s =~ /\./) ? $s : "whois.$s.net";
-		print qq({ ${f}u, ${l}u,\t"$server" },\n);
+		print qq|{ ${f}u, ${l}u,\t"$server" },\n|;
 	} else {
 		die "format error: $_";
 	}
diff --git a/make_as_del.pl b/make_as_del.pl
index 324d3d2..281cb07 100755
--- a/make_as_del.pl
+++ b/make_as_del.pl
@@ -1,20 +1,23 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
+use warnings;
 use strict;
 
 while (<>) {
 	chomp;
-	s/^\s*(.*)\s*$/$1/;
-	s/\s*#.*$//;
+	s/#.*$//;
+	s/^\s+//; s/\s+$//;
 	next if /^$/;
-	die "format error: $_" unless (/^([\d\.]+)\s+([\d\.]+)\s+([\w\.]+)$/);
-	my $f=$1; my $l=$2; my $s=$3;
-	print "{ ${f}, ${l}, \"";
+
+	die "format error: $_" if not (/^([\d\.]+)\s+([\d\.]+)\s+([\w\.]+)$/);
+	my $f = $1; my $l = $2; my $s = $3;
+
+	print qq|{ ${f}, ${l}, "|;
 	if ($s =~ /\./) {
 		print "$s";
 	} else {
 		print "whois.$s.net";
 	}
-	print "\" },\n";
+	print qq|" },\n|;
 }
 
diff --git a/make_ip6_del.pl b/make_ip6_del.pl
index d94629e..80f0b0c 100755
--- a/make_ip6_del.pl
+++ b/make_ip6_del.pl
@@ -1,14 +1,15 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
+use warnings;
 use strict;
 
 while (<>) {
 	chomp;
-	s/^\s*(.*)\s*$/$1/;
-	s/\s*#.*$//;
+	s/#.*$//;
+	s/^\s+//; s/\s+$//;
 	next if /^$/;
 
-	die "invalid line:\n$_\n"
+	die "format error:\n$_\n"
 		if not m#^([\da-fA-F]{4}):([\da-fA-F]{1,4})::/(\d+)\s+([\w\.]+)$#;
 	my $len = $3; my $s = $4;
 	my $i1 = $1; my $i2 = $2;
diff --git a/make_ip_del.pl b/make_ip_del.pl
index ed53351..7ed5c93 100755
--- a/make_ip_del.pl
+++ b/make_ip_del.pl
@@ -1,15 +1,17 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
+use warnings;
 use strict;
 
 while (<>) {
 	chomp;
-	s/^\s*(.*)\s*$/$1/;
-	s/\s*#.*$//;
+	s/#.*$//;
+	s/^\s+//; s/\s+$//;
 	next if /^$/;
 
 	die "format error: $_" if not /^([\d\.]+)\/(\d+)\s+([\w\.]+)$/;
 	my $m = $2; my $s = $3;
+
 	my ($i1, $i2, $i3, $i4) = split(/\./, $1);
 	print '{ ' . (($i1 << 24) + ($i2 << 16) + ($i3 << 8) + $i4) . 'UL, '.
 		((~(0xffffffff >> $m)) & 0xffffffff) . 'UL, "';
@@ -22,6 +24,6 @@ while (<>) {
 	} else {
 		print "whois.$s.net";
 	}
-	print '" },' . "\n";
+	print qq|" },\n|;
 }
 
diff --git a/make_servers_charset.pl b/make_servers_charset.pl
index 8517b75..2f83a09 100755
--- a/make_servers_charset.pl
+++ b/make_servers_charset.pl
@@ -9,13 +9,13 @@ while (<>) {
 	s/^\s+//; s/\s+$//;
 	next if /^$/;
 
-	die "format error: $_" unless
+	die "format error: $_" if not
 		(my ($a, $b, $c) = /^([a-z0-9.-]+)\s+([a-z0-9-]+)(?:\s+(.+))?$/);
 
 	if ($c) {
-		print qq(    { "$a",\t"$b",\t"$c" },\n);
+		print qq|    { "$a",\t"$b",\t"$c" },\n|;
 	} else {
-		print qq(    { "$a",\t"$b",\tNULL },\n);
+		print qq|    { "$a",\t"$b",\tNULL },\n|;
 	}
 }
 
diff --git a/make_tld_serv.pl b/make_tld_serv.pl
index 60d557c..6afa03e 100755
--- a/make_tld_serv.pl
+++ b/make_tld_serv.pl
@@ -9,7 +9,7 @@ while (<>) {
 	s/^\s+//; s/\s+$//;
 	next if /^$/;
 
-	die "format error: $_" unless
+	die "format error: $_" if not
 		(my ($a, $b) = /^([\w\d\.-]+)\s+([\w\d\.:-]+|[A-Z]+\s+.*)$/);
 
 	$b =~ s/^W(?:EB)?\s+/\\x01/;
@@ -17,6 +17,6 @@ while (<>) {
 	$b = "\\x03" if $b eq 'NONE';
 	$b = "\\x08" if $b eq 'AFILIAS';
 	$b = "\\x0C" if $b eq 'ARPA';
-	print qq(    "$a",\t"$b",\n);
+	print qq|    "$a",\t"$b",\n|;
 }