Changeset e4e7407 in lab.git for misc

Timestamp:

Jan 25, 2013 12:11:26 AM (12 years ago)

Author:

mitty <mitty@…>

Branches:

master, trunk

Children:

0e3de64

Parents:

89fbc5d

Message:

• fix: use Encode to correctly handle utf9 file or directory name
• NFKC replaces much more than expected

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

File:

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

misc/findcombinable.pl

@@ -5 +5 @@
 use utf8;
 
+use Encode;
 use Unicode::Normalize qw(NFC NFKC);
+binmode STDOUT => 'encoding(utf8)';
+binmode STDERR => 'encoding(utf8)';
 
 my $top = shift @ARGV || exit;
 if (! -d $top) { exit; }
+
+my $utf8 = find_encoding("utf8");
+$top = $utf8->decode($top);
 
 checkdir($top);
@@ -16 +22 @@
     
     if ($str ne NFC($str)) {
-        return 1;
-    }
-    if ($str ne NFKC($str)) {
         return 1;
     }
@@ -36 +39 @@
     while (my $entry = shift @entries) {
         next if ($entry =~ /^\.+$/);
+        $entry = $utf8->decode($entry);
         if (match($entry)) {
             print "'$target/$entry' can be composed\n";