tools: validate utf8 encoding in stdin/out

Recommended by perlcritic.  Not likely to be an issue in these cases,
but might yet catch some data errors.

diff --git a/tools/mkcharinfo b/tools/mkcharinfo
index 0f5d9bbe13d636f53a598862172a7e7843f862cb..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';

diff --git a/tools/mkclioptions b/tools/mkclioptions
index 54192b079143b08f0da7ede04144dd6bcd85f494..74cdcf61369c5f101a720953aa4344a8edeb9b3a 100755 (executable)
--- a/tools/mkclioptions
+++ b/tools/mkclioptions
@@ -3,7 +3,7 @@ use 5.014;
 use warnings;
 use utf8;
 use re '/msx';
-use open OUT => ':utf8', ':std';
+use open OUT => ':encoding(utf-8)', ':std';
 
 our $VERSION = '1.00';
 

diff --git a/tools/mkdigraphlist b/tools/mkdigraphlist
index 2d1fdbd8380b27cb4d620e5d99bee3ac110bee45..3bc6ff4e751927024e318ffc289cb42d176e627e 100755 (executable)
--- a/tools/mkdigraphlist
+++ b/tools/mkdigraphlist
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use utf8;
 
-use open OUT => ':utf8', ':std';
+use open OUT => ':encoding(utf-8)', ':std';
 
 our $VERSION = '1.06';
 

diff --git a/tools/mkdigraphs-plan9 b/tools/mkdigraphs-plan9
index 31bab3c6494fd78f21da19b68b54d63a4c96333a..41615efc16f49dbd11f17091f00a55b7012bac8f 100755 (executable)
--- a/tools/mkdigraphs-plan9
+++ b/tools/mkdigraphs-plan9
@@ -2,7 +2,7 @@
 use 5.014;
 use warnings;
 use utf8;
-use open IO => ':utf8', ':std';
+use open IO => ':encoding(utf-8)', ':std';
 use Data::Dump 'pp';
 
 our $VERSION = '1.01';

diff --git a/tools/mkdigraphs-rfc b/tools/mkdigraphs-rfc
index 989c92651a4a2e5c44e3a588fafd93f3d07caa8e..48ce7f06171436a30d7b284dda8a30f8085fa393 100755 (executable)
--- a/tools/mkdigraphs-rfc
+++ b/tools/mkdigraphs-rfc
@@ -2,7 +2,7 @@
 use 5.014;
 use warnings;
 use utf8;
-use open OUT => ':utf8', ':std';
+use open OUT => ':encoding(utf-8)', ':std';
 use charnames ':full';
 use Data::Dump 'pp';
 

diff --git a/tools/mkdigraphs-shiar b/tools/mkdigraphs-shiar
index 55134b4bb7487b4a52ff8a790a6fa6d89c16b9b6..58da37cf19677af5e11c1ab56243d6982cc649ac 100755 (executable)
--- a/tools/mkdigraphs-shiar
+++ b/tools/mkdigraphs-shiar
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use 5.014;
 use warnings;
-use open IN => ':utf8', ':std';
+use open IN => ':encoding(utf-8)', ':std';
 
 our $VERSION = '1.03';
 

diff --git a/tools/mkdigraphs-xorg b/tools/mkdigraphs-xorg
index aeed5fe036226bc9c86e888357cd529097fe39d6..c2dd4414f55685e2635924ead388968ba86fe6e3 100755 (executable)
--- a/tools/mkdigraphs-xorg
+++ b/tools/mkdigraphs-xorg
@@ -2,7 +2,7 @@
 use 5.014;
 use warnings;
 use utf8;
-use open IO => ':utf8', ':std';
+use open IO => ':encoding(utf-8)', ':std';
 use re '/msx';
 use Data::Dump 'pp';
 

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index e7cd4f53183c6de1cc7654c92de39b4331e0d83c..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';
 

diff --git a/tools/mkwordlist b/tools/mkwordlist
index 6f42fc86c6d46c67339eb61f0b11b53751ba631f..78e36b6adb5d652e258ec1ad10a9df255d6da9e9 100755 (executable)
--- a/tools/mkwordlist
+++ b/tools/mkwordlist
@@ -4,7 +4,7 @@ use warnings;
 
 BEGIN { push @INC, '.' }
 use Shiar_Sheet::DB;
-use open ':std' => ':utf8';
+use open ':std' => ':encoding(utf-8)';
 my $db = Shiar_Sheet::DB->connect;
 
 say 'use utf8;';