gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

String encoding fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17917 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2003-10-18 06:10:41 +00:00
parent e723e30c14
commit 0627eb75aa
4 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/NSString.m
View file

@ -1321,7 +1321,7 @@ handle_printf_atsign (FILE *stream,
NSStringEncoding enc = _DefaultStringEncoding;
NSData *d;
unsigned int len;
const unichar *test;
const unsigned char *data_bytes;
d = [[NSDataClass alloc] initWithContentsOfFile: path];
if (d == nil)
@ -1336,15 +1336,20 @@ handle_printf_atsign (FILE *stream,
RELEASE(self);
return @"";
}
test = [d bytes];
if ((test != NULL) && (len > 1))
data_bytes = [d bytes];
if ((data_bytes != NULL) && (len >= 2))
{
if ((test[0] == byteOrderMark) || (test[0] == byteOrderMarkSwapped))
const unichar *data_ucs2chars = (const unichar *) data_bytes;
if ((data_ucs2chars[0] == byteOrderMark)
|| (data_ucs2chars[0] == byteOrderMarkSwapped))
{
/* somebody set up us the BOM! */
enc = NSUnicodeStringEncoding;
}
else if (len > 2 && test[0] == 0xEF && test[1] == 0xBB && test[2] == 0xBF)
else if (len >= 3
&& data_bytes[0] == 0xEF
&& data_bytes[1] == 0xBB
&& data_bytes[2] == 0xBF)
{
enc = NSUTF8StringEncoding;
}
@ -1363,7 +1368,7 @@ handle_printf_atsign (FILE *stream,
NSStringEncoding enc = _DefaultStringEncoding;
NSData *d = [NSDataClass dataWithContentsOfURL: url];
unsigned int len = [d length];
const unichar *test;
const unsigned char *data_bytes;
if (d == nil)
{
@ -1376,14 +1381,19 @@ handle_printf_atsign (FILE *stream,
RELEASE(self);
return @"";
}
test = [d bytes];
if ((test != NULL) && (len > 1))
data_bytes = [d bytes];
if ((data_bytes != NULL) && (len >= 2))
{
if ((test[0] == byteOrderMark) || (test[0] == byteOrderMarkSwapped))
const unichar *data_ucs2chars = (const unichar *) data_bytes;
if ((data_ucs2chars[0] == byteOrderMark)
|| (data_ucs2chars[0] == byteOrderMarkSwapped))
{
enc = NSUnicodeStringEncoding;
}
else if (len > 2 && test[0] == 0xEF && test[1] == 0xBB && test[2] == 0xBF)
else if (len >= 3
&& data_bytes[0] == 0xEF
&& data_bytes[1] == 0xBB
&& data_bytes[2] == 0xBF)
{
enc = NSUTF8StringEncoding;
}