From 7cdfdf0954d5e7f75c6f179e7787932bd56018c5 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Mon, 16 Jun 2008 05:31:12 +0200 Subject: [PATCH] Use UTF-8 for data decoding --- NSFileHandleExt.m | 4 ++-- PBEasyPipe.m | 2 +- PBGitCommit.m | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NSFileHandleExt.m b/NSFileHandleExt.m index 0e2412c..9302c99 100644 --- a/NSFileHandleExt.m +++ b/NSFileHandleExt.m @@ -47,14 +47,14 @@ switch (*(buffer + bytesReceived - 1)) { case '\n': buffer[bytesReceived-1] = '\0'; - return [NSString stringWithCString: buffer]; + return [NSString stringWithCString: buffer encoding: NSUTF8StringEncoding]; case '\r': bytesReceived--; } } buffer[bytesReceived-1] = '\0'; - NSString *retVal = [NSString stringWithCString: buffer]; + NSString *retVal = [NSString stringWithCString: buffer encoding: NSUTF8StringEncoding]; free(buffer); return retVal; } diff --git a/PBEasyPipe.m b/PBEasyPipe.m index b2d994c..06a74d1 100644 --- a/PBEasyPipe.m +++ b/PBEasyPipe.m @@ -40,7 +40,7 @@ { NSFileHandle* handle = [self handleForCommand:cmd withArgs: args inDir: dir]; NSData* data = [handle readDataToEndOfFile]; - NSString* string = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding]; + NSString* string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; if ([string hasSuffix:@"\n"]) string = [string substringToIndex:[string length]-1]; diff --git a/PBGitCommit.m b/PBGitCommit.m index 247dfd7..44f4c45 100644 --- a/PBGitCommit.m +++ b/PBGitCommit.m @@ -32,7 +32,7 @@ return details; NSFileHandle* handle = [self.repository handleForCommand:[@"show --pretty=raw " stringByAppendingString:self.sha]]; - details = [[NSString alloc] initWithData:[handle readDataToEndOfFile] encoding: NSASCIIStringEncoding]; + details = [[NSString alloc] initWithData:[handle readDataToEndOfFile] encoding: NSUTF8StringEncoding]; return details; }