Author: rfm
Date: Wed Jun 8 13:29:38 2016
New Revision: 39852
URL: http://svn.gna.org/viewcvs/gnustep?rev=39852&view=rev
Log:
add fallbacks for string conversion
Modified:
libs/base/trunk/Source/NSDebug.m
Modified: libs/base/trunk/Source/NSDebug.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSDebug.m?rev=39852&r1=39851&r2=39852&view=diff
==============================================================================
--- libs/base/trunk/Source/NSDebug.m (original)
+++ libs/base/trunk/Source/NSDebug.m Wed Jun 8 13:29:38 2016
@@ -1126,17 +1126,31 @@
}
-const char *_NSPrintForDebugger(id object)
+const char *
+_NSPrintForDebugger(id object)
{
if (object && [object respondsToSelector: @selector(description)])
- return [[object description] cString];
+ return [[object description] UTF8String];
return NULL;
}
-NSString *_NSNewStringFromCString(const char *cstring)
-{
- return [NSString stringWithCString: cstring
- encoding: [NSString defaultCStringEncoding]];
-}
-
+NSString *
+_NSNewStringFromCString(const char *cstring)
+{
+ NSString *string;
+
+ string = [NSString stringWithCString: cstring
+ encoding: [NSString defaultCStringEncoding]];
+ if (nil == string)
+ {
+ string = [NSString stringWithUTF8String: cstring];
+ if (nil == string)
+ {
+ string = [NSString stringWithCString: cstring
+ encoding: NSISOLatin1StringEncoding];
+ }
+ }
+ return string;
+}
+
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
