tools: validate utf8 encoding in stdin/out

[sheet.git] / tools / mkcharinfo

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 64738ae80acc41c11b135b412ff0afdd940f377e..6d08f9e868004b87b649e150f943eea04f51590b 100755 (executable)
--- a/tools/mkcharinfo
+++ b/tools/mkcharinfo
@@ -4,7 +4,7 @@ use warnings;
 use utf8;
 no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
-use open OUT => ':utf8', ':std';
+use open OUT => ':encoding(utf-8)', ':std';
 use Data::Dump 'pp';
 
 our $VERSION = '1.02';
@@ -21,7 +21,7 @@ my %info = (
 $info{chr $_} //= {} for 32 .. 126;
 
 eval {
-       my $tables = do 'unicode-table.inc.pl' or die $@ || $!;
+       my $tables = do './unicode-table.inc.pl' or die $@ || $!;
        for (values %$tables) {
                for (values %$_) {
                        for (@$_) {
@@ -46,9 +46,9 @@ eval {
 } or warn "Failed importing html entities: $@";
 
 my %diinc = (
-       'data/digraphs-rfc.inc.pl' => 'u-di',
-       'data/digraphs-shiar.inc.pl' => 'u-prop',
-       'data/digraphs-vim.inc.pl' => 'u-vim',
+       './data/digraphs-rfc.inc.pl' => 'u-di',
+       './data/digraphs-shiar.inc.pl' => 'u-prop',
+       './data/digraphs-vim.inc.pl' => 'u-vim',
 );
 for (sort keys %diinc) {
        -e $_ or next;
@@ -64,13 +64,13 @@ for (sort keys %diinc) {
 
 eval {
        # read introducing unicode versions for known characters
-       my $agemap = do 'data/unicode-age.inc.pl' or die $@ || $!;
+       my $agemap = do './data/unicode-age.inc.pl' or die $@ || $!;
        for my $chr (keys %info) {
                my $version = $agemap->{ord $chr} or next;
                $info{$chr}->{class}->{'u-v'.$version}++
        }
        1;
-} or warn "Failed including unicode version data $@";
+} or warn "Failed including unicode version data: $@";
 
 for my $chr (keys %info) {
        my $cp = ord $chr;