From owner-freebsd-bugs@FreeBSD.ORG Wed Sep 17 03:20:02 2008 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76C091065676 for ; Wed, 17 Sep 2008 03:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 490558FC24 for ; Wed, 17 Sep 2008 03:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m8H3K2SV097343 for ; Wed, 17 Sep 2008 03:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m8H3K2Ku097342; Wed, 17 Sep 2008 03:20:02 GMT (envelope-from gnats) Resent-Date: Wed, 17 Sep 2008 03:20:02 GMT Resent-Message-Id: <200809170320.m8H3K2Ku097342@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Edwin Groothuis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2C8B106566C for ; Wed, 17 Sep 2008 03:15:07 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from mail5out.barnet.com.au (mail5.barnet.com.au [202.83.178.78]) by mx1.freebsd.org (Postfix) with ESMTP id 751488FC12 for ; Wed, 17 Sep 2008 03:15:07 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: by mail5out.barnet.com.au (Postfix, from userid 1001) id C62CB2218A69; Wed, 17 Sep 2008 13:15:06 +1000 (EST) Received: from mail5auth.barnet.com.au (mail5.barnet.com.au [202.83.178.78]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mail5auth.barnet.com.au", Issuer "*.barnet.com.au" (verified OK)) by mail5.barnet.com.au (Postfix) with ESMTP id 77D7E21B5AF8 for ; Wed, 17 Sep 2008 13:15:06 +1000 (EST) Received: from k7.mavetju (ppp121-44-125-22.lns10.syd6.internode.on.net [121.44.125.22]) by mail5auth.barnet.com.au (Postfix) with ESMTP id F18AE2218A41 for ; Wed, 17 Sep 2008 13:15:05 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id C6B19220; Wed, 17 Sep 2008 13:15:08 +1000 (EST) Message-Id: <20080917031508.C6B19220@k7.mavetju> Date: Wed, 17 Sep 2008 13:15:08 +1000 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: misc/127430: [patch] Add check-script for share/misc/iso3166 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Sep 2008 03:20:02 -0000 >Number: 127430 >Category: misc >Synopsis: [patch] Add check-script for share/misc/iso3166 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Sep 17 03:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 7.0-RELEASE-p1 i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #2: Wed May 28 08:12:56 EST 2008 edwin@k7.mavetju:/usr/src/sys/i386/compile/k7 i386 >Description: Small perl script for in head/tools/tools/iso. >How-To-Repeat: >Fix: [~/iso] edwin@k7>cat check-iso3166.pl #!/usr/bin/perl -w # # $FreeBSD$ # # This script compares the file iso3166 (from head/share/misc) with the files # list-en1-semic-2.txt (from # http://www.iso.org/iso/list-en1-semic-2.txt) and iso3166-countrycodes.txt # (from ftp://ftp.ripe.net/) to see if there any differences. # # Created by Edwin Groothuis for the FreeBSD project. # use strict; use Data::Dumper; my %old = (); { open(FIN, "iso3166") or die "Cannot open iso3166 (should be in head/share/misc)"; my @lines = ; close(FIN); chomp(@lines); foreach my $l (@lines) { next if ($l =~ /^#/); next if ($l eq ""); die "Bad line: $l\n" if ($l !~ /^([A-Z\-]*)[ \t]+([A-Z\-]+)[ \t]+(\d+)[ \t]+(.*)/); my $two = $1; my $three = $2; my $number = $3; my $name = $4; $old{$two}{two} = $two; $old{$two}{three} = $three; $old{$two}{number} = $number; $old{$two}{name} = $name; } } my %new1 = (); { open(FIN, "iso3166-countrycodes.txt") or die "Cannot open iso3166-countrycodes.txt, which can be retrieved from ftp://ftp.ripe.net/"; my @lines = ; close(FIN); chomp(@lines); my $noticed = 0; foreach my $l (@lines) { if ($l =~ /\-\-\-\-\-\-\-/) { $noticed = 1; next; } next if (!$noticed); next if ($l eq ""); die "Invalid line: $l\n" if ($l !~ /^(.+?)[\t ][\t ]+([A-Z]{2})[\t ]+([A-Z]{3})[\t ]+(\d+)[\t ]*$/); my $two = $2; my $three = $3; my $number = $4; my $name = $1; $new1{$two}{two} = $two; $new1{$two}{three} = $three; $new1{$two}{number} = $number; $new1{$two}{name} = $name; } } my %new2 = (); { open(FIN, "list-en1-semic-2.txt") or die "Cannot open list-en1-semic-2.txt, which can be retrieved from http://www.iso.org/iso/list-en1-semic-2.txt"; my @lines = ; close(FIN); chomp(@lines); my $noticed = 0; foreach my $l (@lines) { $l =~ s/\x0d//g; if (!$noticed) { # skip the first line $noticed = 1; next; } next if ($l eq ""); my @a = split(/;/, $l); die "Invalid line: $l\n" if ($#a != 1); my $two = $a[1]; my $name = $a[0]; $new2{$two}{two} = $two; $new2{$two}{name} = $name; } } { my $c = 0; foreach my $two (sort(keys(%old))) { if (!defined $new1{$two}) { print "In old but not new1: $old{$two}{two}\t$old{$two}{three}\t$old{$two}{number}\t$old{$two}{name}\n"; $c++; } if (!defined $new2{$two}) { print "In old but not new2: $old{$two}{two}\t$old{$two}{name}\n"; $c++; } } print "Found $c issues\n"; } { my $c = 0; foreach my $two (sort(keys(%new1))) { next if (defined $old{$two}); print "In new1 but not old: $new1{$two}{two}\t$new1{$two}{three}\t$new1{$two}{number}\t$new1{$two}{name}\n"; $c++; } print "Found $c issues\n"; } { my $c = 0; foreach my $two (sort(keys(%new2))) { next if (defined $old{$two}); print "In new2 but not old: $new2{$two}{two}\t$new2{$two}{name}\n"; $c++; } print "Found $c issues\n"; } { my $c = 0; foreach my $two (sort(keys(%old))) { if (defined $new1{$two}) { if ($old{$two}{two} ne $new1{$two}{two} || $old{$two}{three} ne $new1{$two}{three} || $old{$two}{number} ne $new1{$two}{number} || lc($old{$two}{name}) ne lc($new1{$two}{name})) { print "In old : $old{$two}{two}\t$old{$two}{three}\t$old{$two}{number}\t$old{$two}{name}\n"; print "In new1: $new1{$two}{two}\t$new1{$two}{three}\t$new1{$two}{number}\t$new1{$two}{name}\n"; $c++; } } } print "Found $c issues\n"; } { my $c = 0; foreach my $two (sort(keys(%old))) { if (defined $new2{$two}) { if ($old{$two}{two} ne $new2{$two}{two} || lc($old{$two}{name}) ne lc($new2{$two}{name})) { print "In old : $old{$two}{two}\t$old{$two}{name}\n"; print "In new2: $new2{$two}{two}\t$new2{$two}{name}\n"; $c++; } } } print "Found $c issues\n"; } >Release-Note: >Audit-Trail: >Unformatted: