@@ -47,7 +47,10 @@ switch (*(buffer + bytesReceived - 1)) { case '\n': buffer[bytesReceived-1] = '\0'; - return [NSString stringWithCString: buffer encoding: NSUTF8StringEncoding]; + NSString* s = [NSString stringWithCString: buffer encoding: NSUTF8StringEncoding]; + if ([s length] == 0) + s = [NSString stringWithCString: buffer encoding: NSASCIIStringEncoding]; + return s; case '\r': bytesReceived--; } @@ -55,6 +58,9 @@ buffer[bytesReceived-1] = '\0'; NSString *retVal = [NSString stringWithCString: buffer encoding: NSUTF8StringEncoding]; + if ([retVal length] == 0) + retVal = [NSString stringWithCString: buffer encoding: NSASCIIStringEncoding]; + free(buffer); return retVal; } NSFileHandleExt.m e72d93c87265e4d8573ecb52af094af12569821b Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/ecd4ce4aff8ee6ac284ea9f7079cf0bf4f70d23a ecd4ce4aff8ee6ac284ea9f7079cf0bf4f70d23a 2008-06-17T04:59:20-07:00 2008-06-17T04:56:31-07:00 Fix bug in encoding parsing If a commit had invalid UTF-8 characters in them -- like one in git.git for example -- then the revparsing would stop halfway through. This patch first tries UTF-8 enconding, and if that fails, falls back to ASCII encoding. 1411c60dd1b2c48fbeef9b34bae6a14ce7e83644 Pieter de Bie pdebie@ai.rug.nl