diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

encoding detection

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-10-05 10:32:56 +01:00
parent 263fdf330d
commit e5fc818c37
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
os/chartypes.c
View File

@ -115,7 +115,7 @@ static enc_map_t ematches[] = {
{NULL, ENC_OCTET}}; {NULL, ENC_OCTET}};
static encoding_t DefaultEncoding(void) { static encoding_t DefaultEncoding(void) {
CACHE_REGS encoding_t rc;
int i = 0, j; int i = 0, j;
char *enc; char *enc;
while (encvs[i]) { while (encvs[i]) {
@ -125,28 +125,31 @@ static encoding_t DefaultEncoding(void) {
/* that's how it is supposed to be, except in OSX */ /* that's how it is supposed to be, except in OSX */
if (!enc) if (!enc)
enc = v; enc = v;
else
enc++;
// now that we have one name, try to match it // now that we have one name, try to match it
j = 0; j = 0;
while (ematches[j].s != NULL) { while (ematches[j].s) {
if (!strcmp(ematches[j].s, enc)) { if (!strcmp(ematches[j].s, enc))
return LOCAL_encoding = ematches[j].e; return ematches[j].e;
} else {
j++;
}
} }
Yap_Warning("System uses unknown default encoding %s (taken from %s)",
enc, v);
} else {
i++;
} }
i++;
} }
// by default, return UTF-8 // by default, return UTF-8
// except in _WIN32 // except in _WIN32
#ifdef _WIN32 #ifdef _WIN32
return ENC_UTF16_BE; rc = ENC_UTF16_BE;
#else #else
return ENC_ISO_UTF8; rc = ENC_ISO_UTF8;
#endif #endif
{
int j = 0;
while (rc != ematches[j].e)
j++;
Yap_Warning("YAP will use default encoding %s", ematches[j].s);
}
return rc;
} }
encoding_t Yap_DefaultEncoding(void) { encoding_t Yap_DefaultEncoding(void) {
@ -160,7 +163,6 @@ void Yap_SetDefaultEncoding(encoding_t new_encoding) {
} }
encoding_t Yap_InitialEncoding(void) { encoding_t Yap_InitialEncoding(void) {
return ENC_ISO_UTF8;
char *s = getenv("LANG"); char *s = getenv("LANG");
size_t sz; size_t sz;