Changeset 2526624 in lab.git for misc

Timestamp:

Jan 25, 2013 8:01:38 PM (11 years ago)

Author:

mitty <mitty@…>

Branches:

master, trunk

Children:

dfae53c

Parents:

0e3de64

Message:

• remove needless export of NFKC
• change order of decode() and remove needless binmode

git-svn-id: ​https://lab.mitty.jp/svn/lab/trunk@194 7d2118f6-f56c-43e7-95a2-4bb3031d96e7

File:

• misc/findcombinable.pl (modified) (4 diffs)

misc/findcombinable.pl

@@ -6 +6 @@
 
 use Encode;
-use Unicode::Normalize qw(NFC NFKC);
-binmode STDOUT => 'encoding(utf8)';
-binmode STDERR => 'encoding(utf8)';
+use Unicode::Normalize qw(NFC);
 
 my $top = shift @ARGV || exit;
@@ -14 +12 @@
 
 my $utf8 = find_encoding("utf8");
-$top = $utf8->decode($top);
 
 checkdir($top);
@@ -21 +18 @@
     my $str = shift @_;
     
+    $str = $utf8->decode($str);
     if ($str ne NFC($str)) {
         return 1;
@@ -38 +36 @@
     my @dirs;
     while (my $entry = shift @entries) {
-        $entry = $utf8->decode($entry);
         if (match($entry)) {
             print "'$target/$entry' can be composed\n";