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

Make first moves towards handling the fact that unicode and cString

Browse source 
representations of the same string may contain different numbers of
characters.  In particular, UTF8 of course.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@10643 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2001-08-03 12:24:25 +00:00
parent 6dd9426be9
commit c6c48ab7e9
5 changed files with 504 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Source/NSString.m
View file

@ -601,7 +601,8 @@ handle_printf_atsign (FILE *stream,
unichar *buf;
buf = (unichar*)NSZoneMalloc(GSObjCZone(self), sizeof(unichar)*length);
length = encode_strtoustr(buf, byteString, length, _DefaultStringEncoding);
length = encode_cstrtoustr(buf, length, byteString, length,
_DefaultStringEncoding);
if (flag == YES && byteString != 0)
{
NSZoneFree(NSZoneFromPointer(byteString), byteString);
@ -694,7 +695,8 @@ handle_printf_atsign (FILE *stream,
unichar *s;
s = NSZoneMalloc(GSObjCZone(self), sizeof(unichar)*length);
length = encode_strtoustr(s, bytes, length+1, NSUTF8StringEncoding);
length = encode_cstrtoustr(s, length, bytes, length,
NSUTF8StringEncoding);
self = [self initWithCharactersNoCopy: s
length: length
freeWhenDone: YES];
@ -1101,7 +1103,8 @@ handle_printf_atsign (FILE *stream,
unichar *u;
u = NSZoneMalloc(GSObjCZone(self), sizeof(unichar)*length);
length = encode_strtoustr(u, bytes, length+1, NSUTF8StringEncoding);
length = encode_cstrtoustr(u, length, bytes, length,
NSUTF8StringEncoding);
self = [self initWithCharactersNoCopy: u
length: length
freeWhenDone: YES];
@ -1141,7 +1144,7 @@ handle_printf_atsign (FILE *stream,
}
else
{
count = encode_strtoustr(u, b, len, encoding);
count = encode_cstrtoustr(u, len, b, len, encoding);
}
self = [self initWithCharactersNoCopy: u length: count freeWhenDone: YES];
@ -2307,23 +2310,37 @@ handle_printf_atsign (FILE *stream,
else
{
int t;
int bsiz;
unichar *u;
unsigned char *buff;
u = (unichar*)NSZoneMalloc(NSDefaultMallocZone(), len*sizeof(unichar));
[self getCharacters: u];
buff = (unsigned char*)NSZoneMalloc(NSDefaultMallocZone(), len);
if (flag == YES)
t = encode_ustrtostr(buff, u, len, encoding);
else
t = encode_ustrtostr_strict(buff, u, len, encoding);
if (encoding == NSUTF8StringEncoding)
{
bsiz = len * 4;
}
else
{
bsiz = len;
}
buff = (unsigned char*)NSZoneMalloc(NSDefaultMallocZone(), bsiz);
flag = (flag == YES) ? NO : YES;
t = encode_ustrtocstr(buff, bsiz, u, len, encoding, flag);
NSZoneFree(NSDefaultMallocZone(), u);
if (t == 0)
{
NSZoneFree(NSDefaultMallocZone(), buff);
return nil;
}
return [NSDataClass dataWithBytesNoCopy: buff length: t];
else
{
if (bsiz != t)
{
buff = NSZoneRealloc(NSDefaultMallocZone(), buff, t);
}
return [NSDataClass dataWithBytesNoCopy: buff length: t];
}
}
return nil;
}