Make the small perl programs uniform in style

This commit is contained in:
Marco d'Itri 2014-04-23 05:46:24 +02:00
parent 084b02ceab
commit 13bce6f4ce
7 changed files with 38 additions and 32 deletions

View File

@ -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

View File

@ -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: $_";
}

View File

@ -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\.]+)$/);
die "format error: $_" if not (/^([\d\.]+)\s+([\d\.]+)\s+([\w\.]+)$/);
my $f = $1; my $l = $2; my $s = $3;
print "{ ${f}, ${l}, \"";
print qq|{ ${f}, ${l}, "|;
if ($s =~ /\./) {
print "$s";
} else {
print "whois.$s.net";
}
print "\" },\n";
print qq|" },\n|;
}

View File

@ -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;

View File

@ -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|;
}

View File

@ -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|;
}
}

View File

@ -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|;
}