Changeset 4925

Timestamp:

10/29/09 08:48:20 (4 weeks ago)

Author:

asawada

Message:

Fixed Backup/Restore can't handle multibyte named file. bugzid:102920.

Location:

branches/greyhound/lib/MT

Files:

• FileMgr/Local.pm (modified) (1 diff)
• Util/Archive/Tgz.pm (modified) (2 diffs)
• Util/Archive/Zip.pm (modified) (4 diffs)

branches/greyhound/lib/MT/FileMgr/Local.pm

@@ -20 +20 @@
 
 sub _syserr {
-    return $_[0] if $^O ne 'MSWin32';
-    return Encode::decode('Shift_JIS', $_[0]) unless Encode::is_utf8($_[0]);
-    $_[0];
+    if ( $^O eq 'MSWin32' ) {
+        return Encode::is_utf8($_[0]) ? $_[0]
+                                      : Encode::decode('Shift_JIS', $_[0])
+                                      ;
+    }
+    else {
+        return Encode::is_utf8($_[0]) ? $_[0]
+                                      : Encode::decode_utf8($_[0])
+                                      ;
+    }
 }
 

branches/greyhound/lib/MT/Util/Archive/Tgz.pm

@@ -117 +117 @@
     $path ||= MT->config->TempDir;
     for my $file ( $obj->files ) {
-        my $file_enc = MT::FileMgr::Local::_syserr( $file );
+        my $file_enc = Encode::decode_utf8( $file );
         my $f = File::Spec->catfile( $path, $file_enc );
         $obj->{_arc}->extract_file( $file, MT::FileMgr::Local::_local( $f ) );
@@ -129 +129 @@
     return $obj->error(MT->translate('Can\'t write to the object'))
         if 'r' eq $obj->{_mode};
+    $file_path = Encode::encode_utf8($file_path)
+        if Encode::is_utf8($file_path);
     my $filename =
         File::Spec->catfile( $path, $file_path );

branches/greyhound/lib/MT/Util/Archive/Zip.pm

@@ -21 +21 @@
     return $pkg->error(MT->translate('Type must be zip'))
         unless $type eq ARCHIVE_TYPE;
-    
+
     my $zip = Archive::Zip->new;
     my $obj = { _flushed => 0, _arc => $zip };
@@ -101 +101 @@
     $path ||= MT->config->TempDir;
     for my $file ( $obj->files ) {
-        my $file_enc = MT::FileMgr::Local::_syserr( $file );
+        my $file_enc = Encode::decode('Shift_JIS', $file );
         my $f = File::Spec->catfile( $path, $file_enc );
         $obj->{_arc}->extractMember( $file, MT::FileMgr::Local::_local( $f ) );
@@ -115 +115 @@
     my $filename =
         File::Spec->catfile( $path, $file_path );
+    $file_path = Encode::encode('Shift_JIS', $file_path)
+        if Encode::is_utf8($file_path);
     $obj->{_arc}->addFile( $filename, $file_path );
 }
@@ -125 +127 @@
     return $obj->error(MT->translate('Both data and file name must be specified.'))
         unless $string && $file_name;
-
+    $file_name = Encode::encode('Shift_JIS', $file_name)
+        if Encode::is_utf8($file_name);
     $obj->{_arc}->addString($string, $file_name);
 }