tools: validate utf8 encoding in stdin/out

[sheet.git] / tools / mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index de0bbf12365478ac4820fe722e805c42c5ed967d..95330255001f3a1e9061c37688cb89b2f52dc5e6 100755 (executable)
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -3,7 +3,7 @@ use 5.014;
 use warnings;
 use utf8;
 
-use open OUT => ':utf8', ':std';
+use open OUT => ':encoding(utf-8)', ':std';
 use File::Basename 'basename';
 use Data::Dump 'pp';
 
@@ -13,9 +13,13 @@ my @fontlist;
 
 my %cover;
 my $incsuffix = '.inc.pl';
-for my $fontfile (glob 'ttfsupport/*'.$incsuffix) {
+for my $fontfile (glob 'data/font/*'.$incsuffix) {
        my ($fontid) = basename($fontfile, $incsuffix);
-       my ($fontmeta, @fontrange) = do $fontfile or next;
+       my ($fontmeta, @fontrange) = do "./$fontfile";
+       if (!$fontmeta) {
+               warn "$fontfile: $!";
+               next;
+       }
        $fontmeta->{file} = $fontid;
        my $year = substr $fontmeta->{date}, 0, 4;
        $fontmeta->{description} = join(' ',
@@ -31,7 +35,7 @@ my %charlist;
 
 $charlist{table}->{abc} = ['A'..'Z', 'a'..'z'];
 
-my $chartables = do 'unicode-table.inc.pl' or warn $@ || $!;
+my $chartables = do './unicode-table.inc.pl' or warn $@ || $!;
 if ($chartables) {
        while (my ($tablegroup, $grouprow) = each %{$chartables}) {
                while (my ($tablename, $chars) = each %{$grouprow}) {
@@ -65,7 +69,7 @@ eval {
 } or warn "Could not include count for html entities: $@";
 
 eval {
-       my $agemap = do 'unicode-age.inc.pl'
+       my $agemap = do './data/unicode-age.inc.pl'
                or warn "Could not include unicode version data: $!";
 
        use Unicode::UCD 'charinfo';