Skip to content

Japanese file name garbled #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Japanese file name garbled #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ZipZap/ZZOldArchiveEntry.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,19 @@ - (BOOL)check:(out NSError**)error

- (NSString*)fileNameWithEncoding:(NSStringEncoding)encoding
{
return [[NSString alloc] initWithBytes:_centralFileHeader->fileName()

NSString *encodedString = nil;

if (encoding == CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingDOSLatinUS)) {
BOOL lossyConversion = NO;
NSData *data = [NSData dataWithBytesNoCopy:_centralFileHeader->fileName() length:_centralFileHeader->fileNameLength freeWhenDone:NO];
[NSString stringEncodingForData:data encodingOptions:nil convertedString:&encodedString usedLossyConversion:&lossyConversion];
} else {
encodedString = [[NSString alloc] initWithBytes:_centralFileHeader->fileName()
length:_centralFileHeader->fileNameLength
encoding:encoding];
}
return encodedString;
}

- (BOOL)checkEncryptionAndCompression:(out NSError**)error
Expand Down