Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 12:27:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Proper construction of the UTF-8 locale names if the currect locale has a "@" in it.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-07-25 09:43:18 +00:00
parent e0e7d0635c
commit 504f803bdb
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/common.cpp
View File

@ -667,6 +667,26 @@ UTFstring cstr_to_UTFstring(const char *c) {
#endif
}
static string make_utf8_locale(const char *old_locale) {
string s = old_locale, at;
int pos;
pos = s.find('@');
if (pos >= 0) {
at = s.substr(pos);
s.erase(pos);
}
pos = s.find('.');
if (pos >= 0)
s.erase(pos);
s += ".UTF-8";
s += at;
return s;
}
UTFstring cstrutf8_to_UTFstring(const char *c) {
#if defined(COMP_MSC) || defined(COMP_MINGW)
wchar_t *new_string;
@ -686,7 +706,7 @@ UTFstring cstrutf8_to_UTFstring(const char *c) {
char *old_locale;
string new_locale;
UTFstring u;
int len, pos;
int len;
len = strlen(c);
new_string = (wchar_t *)safemalloc((len + 1) * sizeof(wchar_t));
@ -694,10 +714,7 @@ UTFstring cstrutf8_to_UTFstring(const char *c) {
new_string[len] = L'\0';
old_locale = safestrdup(setlocale(LC_CTYPE, NULL));
setlocale(LC_CTYPE, "");
new_locale = setlocale(LC_CTYPE, NULL);
if ((pos = new_locale.rfind(".")) >= 0)
new_locale.erase(pos);
new_locale += ".UTF-8";
new_locale = make_utf8_locale(setlocale(LC_CTYPE, NULL));
if (setlocale(LC_CTYPE, new_locale.c_str()) == NULL)
die("Could not set the locale to %s. This is your normal locale with the "
"UTF-8 charset. Please consider your system documentation how to "
@ -759,7 +776,7 @@ char *UTFstring_to_cstrutf8(const UTFstring &u) {
#else
const wchar_t *sptr;
char *new_string, *old_locale;
int len, pos;
int len;
string new_locale;
len = u.length();
@ -768,10 +785,7 @@ char *UTFstring_to_cstrutf8(const UTFstring &u) {
sptr = u.c_str();
old_locale = safestrdup(setlocale(LC_CTYPE, NULL));
setlocale(LC_CTYPE, "");
new_locale = setlocale(LC_CTYPE, NULL);
if ((pos = new_locale.rfind(".")) >= 0)
new_locale.erase(pos);
new_locale += ".UTF-8";
new_locale = make_utf8_locale(setlocale(LC_CTYPE, NULL));
if (setlocale(LC_CTYPE, new_locale.c_str()) == NULL)
die("Could not set the locale to %s. This is your normal locale with the "
"UTF-8 charset. Please consider your system documentation how to "