kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

PBEasyPipe: Fall back to ASCII encoding when UTF-8 fails

Browse Source 
This seems to be the only sensible thing to do, as we can't guess
what the encoding would otherwise be.
This commit is contained in:
Pieter de Bie
2008-12-15 18:00:34 +01:00
parent 56a6adc234
commit 530377a121
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBEasyPipe.m
+14 -21
View File
@@ -51,21 +51,7 @@
inDir:(NSString *) dir
retValue:(int *) ret
{
NSTask *task = [self taskForCommand:cmd withArgs:args inDir:dir];
NSFileHandle* handle = [task.standardOutput fileHandleForReading];
[task launch];
NSData* data = [handle readDataToEndOfFile];
NSString* string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
// Strip trailing newline
if ([string hasSuffix:@"\n"])
string = [string substringToIndex:[string length]-1];
[task waitUntilExit];
if (ret)
*ret = [task terminationStatus];
return string;
return [self outputForCommand:cmd withArgs:args inDir:dir inputString:NULL retValue:ret];
}
// TODO: Refactor this to use the function above
@@ -77,15 +63,20 @@
{
NSTask *task = [self taskForCommand:cmd withArgs:args inDir:dir];
NSFileHandle* handle = [task.standardOutput fileHandleForReading];
task.standardInput = [NSPipe pipe];
NSFileHandle *inHandle = [task.standardInput fileHandleForWriting];
[inHandle writeData:[input dataUsingEncoding:NSUTF8StringEncoding]];
[inHandle closeFile];
if (input) {
task.standardInput = [NSPipe pipe];
NSFileHandle *inHandle = [task.standardInput fileHandleForWriting];
[inHandle writeData:[input dataUsingEncoding:NSUTF8StringEncoding]];
[inHandle closeFile];
}
[task launch];
NSData* data = [handle readDataToEndOfFile];
NSString* string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
if (!string)
string = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
// Strip trailing newline
if ([string hasSuffix:@"\n"])
@@ -108,7 +99,9 @@
[task launch];
#warning This can cause a "Bad file descriptor"... when?
NSData* data = [handle readDataToEndOfFile];
NSString* string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
if (!string)
string = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
// Strip trailing newline
if ([string hasSuffix:@"\n"])