Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-05-06 21:35:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ryan's fix is still good for the built-in version of iconv_open()

Browse Source 
--HG--
branch : SDL-1.2
This commit is contained in:
Sam Lantinga 2007-07-12 08:04:10 +00:00
parent 0d5dbe63e0
commit b8389ee714
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/stdlib/SDL_iconv.c
View File

@ -131,9 +131,10 @@ static struct {
{ "UCS-4", ENCODING_UCS4 },
};
static const char *getlocale()
static const char *getlocale(char *buffer, size_t bufsize)
{
const char *lang;
char *ptr;
lang = SDL_getenv("LC_ALL");
if ( !lang ) {
@ -148,7 +149,20 @@ static const char *getlocale()
if ( !lang || !*lang || SDL_strcmp(lang, "C") == 0 ) {
lang = "ASCII";
}
return lang;
/* We need to trim down strings like "en_US.UTF-8@blah" to "UTF-8" */
ptr = SDL_strchr(lang, '.');
if (ptr != NULL) {
lang = ptr + 1;
}
SDL_strlcpy(buffer, lang, bufsize);
ptr = SDL_strchr(buffer, '@');
if (ptr != NULL) {
*ptr = '\0'; /* chop end of string. */
}
return buffer;
}
SDL_iconv_t SDL_iconv_open(const char *tocode, const char *fromcode)
@ -156,12 +170,14 @@ SDL_iconv_t SDL_iconv_open(const char *tocode, const char *fromcode)
int src_fmt = ENCODING_UNKNOWN;
int dst_fmt = ENCODING_UNKNOWN;
int i;
char fromcode_buffer[64];
char tocode_buffer[64];
if ( !fromcode || !*fromcode ) {
fromcode = getlocale();
fromcode = getlocale(fromcode_buffer, sizeof(fromcode_buffer));
}
if ( !tocode || !*tocode ) {
fromcode = getlocale();
tocode = getlocale(tocode_buffer, sizeof(tocode_buffer));
}
for ( i = 0; i < SDL_arraysize(encodings); ++i ) {
if ( SDL_strcasecmp(fromcode, encodings[i].name) == 0 ) {