diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2020-05-15 11:31:40 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2020-05-15 11:31:40 +0200 |
commit | aae02a43daf93e979f536514fde6172de6ba44ff (patch) | |
tree | 13f8233a82caba151eb84c86df7682b612e9b0b3 /libsi | |
parent | ab308bea3175dd21139b7b842b6de56bf88d8b1c (diff) | |
download | vdr-aae02a43daf93e979f536514fde6172de6ba44ff.tar.gz vdr-aae02a43daf93e979f536514fde6172de6ba44ff.tar.bz2 |
Modified setting system and override character tables
Diffstat (limited to 'libsi')
-rw-r--r-- | libsi/si.c | 50 | ||||
-rw-r--r-- | libsi/si.h | 6 |
2 files changed, 34 insertions, 22 deletions
@@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: si.c 4.1 2020/05/14 21:21:03 kls Exp $ + * $Id: si.c 4.2 2020/05/15 11:31:40 kls Exp $ * * ***************************************************************************/ @@ -311,7 +311,7 @@ static const char *CharacterTables2[] = { #define NumEntries(Table) (sizeof(Table) / sizeof(char *)) -static const char *SystemCharacterTable = NULL; +static char *SystemCharacterTable = NULL; bool SystemCharacterTableIsSingleByte = true; bool systemCharacterTableIsSingleByte(void) @@ -321,32 +321,42 @@ bool systemCharacterTableIsSingleByte(void) static char *OverrideCharacterTable = NULL; -void SetOverrideCharacterTable(const char *CharacterTable) +bool SetOverrideCharacterTable(const char *CharacterTable) { free(OverrideCharacterTable); OverrideCharacterTable = CharacterTable ? strdup(CharacterTable) : NULL; + if (OverrideCharacterTable) { + // Check whether the character table is known: + iconv_t cd = iconv_open(SystemCharacterTable, OverrideCharacterTable); + if (cd != (iconv_t)-1) { + iconv_close(cd); + return true; + } + } + return false; } bool SetSystemCharacterTable(const char *CharacterTable) { - if (CharacterTable) { - for (unsigned int i = 0; i < NumEntries(CharacterTables1); i++) { - if (CharacterTables1[i] && strcasecmp(CharacterTable, CharacterTables1[i]) == 0) { - SystemCharacterTable = CharacterTables1[i]; - SystemCharacterTableIsSingleByte = i <= SingleByteLimit; - return true; - } - } - for (unsigned int i = 0; i < NumEntries(CharacterTables2); i++) { - if (CharacterTables2[i] && strcasecmp(CharacterTable, CharacterTables2[i]) == 0) { - SystemCharacterTable = CharacterTables2[i]; - SystemCharacterTableIsSingleByte = true; - return true; + free(SystemCharacterTable); + SystemCharacterTable = CharacterTable ? strdup(CharacterTable) : NULL; + SystemCharacterTableIsSingleByte = true; + if (SystemCharacterTable) { + // Check whether the character table is known and "single byte": + char a[] = "ä"; + char *pa = a; + char b[10]; + char *pb = b; + size_t la = strlen(a); + size_t lb = sizeof(b); + iconv_t cd = iconv_open(SystemCharacterTable, "ISO-8859-1"); + if (cd != (iconv_t)-1) { + if (iconv(cd, &pa, &la, &pb, &lb) != size_t(-1)) { + *pb = 0; + SystemCharacterTableIsSingleByte = strlen(b) == 1; } + iconv_close(cd); + return true; } - } else { - SystemCharacterTable = NULL; - SystemCharacterTableIsSingleByte = true; - return true; } return false; } @@ -6,7 +6,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * $Id: si.h 4.1 2020/05/14 21:21:03 kls Exp $ + * $Id: si.h 4.2 2020/05/15 11:31:40 kls Exp $ * * ***************************************************************************/ @@ -527,7 +527,9 @@ protected: // Set the character table to use for strings that do not begin with a character // table indicator. Call with NULL to turn this off. -void SetOverrideCharacterTable(const char *CharacterTable); +// Must be called *after* SetSystemCharacterTable()! +// Returns true if the character table was recognized. +bool SetOverrideCharacterTable(const char *CharacterTable); // Call this function to set the system character table. CharacterTable is a string // like "iso8859-15" or "utf-8" (case insensitive). // Returns true if the character table was recognized. |