Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refine the error handling behavior. note: we depart from the bebook specification for returning B_ERROR when no characters are converted. we do this in exactly one situation: when there are no bytes in the input. this behavior is the behavior given by the R5 libs themselves. not having this behavior caused an error in our stylededit as well. stylededit has been fixed to not exercise this functionality. also added in the two most popular chinese encodings for my own evil purposes. GB18030 support is required to legally sell an operating system in mainland china as well. GB18030 support encompasses GBK and GB2312, additionally.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4276 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty 2003-08-13 05:38:07 +00:00
parent 1501c2bf3e
commit 5b7ea503a7
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/kits/support/Jamfile
View File

@ -8,6 +8,7 @@ SharedLibrary textencoding :
character_sets.cpp
utf8_conversions.cpp
;
DEPENDS libtextencoding.so : libiconv.so ;
LinkSharedOSLibs libtextencoding.so :
be
iconv

9
src/kits/support/character_sets.cpp
View File

@ -104,6 +104,14 @@ const char * iso15aliases[] =
{ "ISO_8859-14","Latin-9",NULL };
const BCharacterSet iso15(24,111,"ISO 8859-15","ISO-8859-15","ISO-8859-15",iso15aliases);
// chinese character set testing
const char * big5aliases[] =
{ "csBig5",NULL };
const BCharacterSet big5(25,2026,"Big5","Big5","Big5",big5aliases);
const BCharacterSet gb18030(26,114,"GB18030","GB18030",NULL,NULL);
/**
* The following initializes the global character set array.
* It is organized by id for efficient retrieval using predefined constants in UTF8.h and Font.h.
@ -122,6 +130,7 @@ const BCharacterSet * character_sets_by_id[] = {
&windows1252, &unicode2, &KOI8R, &windows1251,
&IBM866, &IBM437, &eucKR, &iso13, &iso14, &iso15,
// R5 convert_to/from_utf8 encodings end here
&big5,&gb18030,
};
const uint32 character_sets_by_id_count = sizeof(character_sets_by_id)/sizeof(const BCharacterSet*);

28
src/kits/support/utf8_conversions.cpp
View File

@ -15,6 +15,10 @@ convert_encoding(const char * from, const char * to,
char * dst, int32 * dstLen,
int32 * state)
{
if (*srcLen == 0) {
// nothing to do!
return B_OK;
}
iconv_t conversion = iconv_open(to,from);
if (conversion == (iconv_t)-1) {
return B_ERROR;
@ -28,14 +32,30 @@ convert_encoding(const char * from, const char * to,
input_buffer_t inputBuffer = const_cast<input_buffer_t>(&src);
size_t inputLeft = *srcLen;
size_t outputLeft = *dstLen;
size_t bytesLeft = iconv(conversion,inputBuffer,&inputLeft,&dst,&outputLeft);
size_t nonReversibleConversions = iconv(conversion,inputBuffer,&inputLeft,&dst,&outputLeft);
*srcLen -= inputLeft;
*dstLen -= outputLeft;
if ((bytesLeft != 0) && (errno != E2BIG) && (errno != EINVAL)) {
iconv_close(conversion);
if (nonReversibleConversions == -1) {
switch (errno) {
case EILSEQ: // invalid multibyte sequence in the source
return B_ERROR;
case EINVAL: // incomplete multibyte sequence in the input
return B_OK;
case E2BIG: // not enough room in the output buffer for the next converted character
return B_OK;
default:
// unknown error
int err = errno;
}
}
if (*srcLen != 0) {
// able to convert at least one character
return B_OK;
} else {
// not able to convert at least one character
return B_ERROR;
}
iconv_close(conversion);
return B_OK;
}
status_t