mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 00:11:26 +00:00
Use utf8 encoding for 8bit strings
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18538 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
188274523d
commit
4a9d894b9d
2 changed files with 6 additions and 5 deletions
|
@ -1,7 +1,7 @@
|
|||
2004-02-02 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSPropertyList.m: Integrate new parser to
|
||||
NSPropertyListSerialisation
|
||||
NSPropertyListSerialisation. Assume 8bit strings are utf8.
|
||||
|
||||
2004-02-04 01:10 Alexander Malmberg <alexander@malmberg.org>
|
||||
|
||||
|
|
|
@ -2301,7 +2301,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
unsigned char postfix[32];
|
||||
|
||||
// FIXME: Get more of the details
|
||||
[data getBytes: postfix range: NSMakeRange(length-32, 32)];
|
||||
[plData getBytes: postfix range: NSMakeRange(length-32, 32)];
|
||||
size = postfix[6];
|
||||
if (size < 1 || size > 2)
|
||||
{
|
||||
|
@ -2517,16 +2517,17 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
{
|
||||
// Short string
|
||||
unsigned len = next - 0x50;
|
||||
unsigned char buffer[len];
|
||||
unsigned char buffer[len+1];
|
||||
|
||||
[data getBytes: buffer range: NSMakeRange(counter, len)];
|
||||
buffer[len] = '\0';
|
||||
if (mutability == NSPropertyListMutableContainersAndLeaves)
|
||||
{
|
||||
result = [NSMutableString stringWithCString: buffer length: len];
|
||||
result = [NSMutableString stringWithUTF8String: buffer];
|
||||
}
|
||||
else
|
||||
{
|
||||
result = [NSString stringWithCString: buffer length: len];
|
||||
result = [NSString stringWithUTF8String: buffer];
|
||||
}
|
||||
}
|
||||
else if (next == 0x5F)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue