Merge git://github.com/rfc1036/whoisHEADmaster

1 files changed, 5 insertions, 4 deletions

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;