thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: added support for ini files with non english characters

Browse source
This commit is contained in:
Andrei Prykhodko 2019-08-20 13:12:12 +03:00 • committed by Filippos Karapetis
parent 1dd915ccdf
commit c2054682f0
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/ini-file.cpp
View file

@ -29,12 +29,18 @@
namespace Common {
bool INIFile::isValidName(const String &name) const {
if (_allowNonEnglishCharacters)
return true;
const char *p = name.c_str();
while (*p && (isAlnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == ' '))
p++;
return *p == 0;
}
INIFile::INIFile() {
_allowNonEnglishCharacters = false;
}
void INIFile::clear() {
_sections.clear();
}
@ -102,7 +108,7 @@ bool INIFile::loadFromStream(SeekableReadStream &stream) {
// is, verify that it only consists of alphanumerics,
// periods, dashes and underscores). Mohawk Living Books games
// can have periods in their section names.
while (*p && (isAlnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == ' '))
while (*p && ((_allowNonEnglishCharacters && *p != ']') || isAlnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == ' '))
p++;
if (*p == '\0')
@ -435,4 +441,8 @@ void INIFile::Section::removeKey(const String &key) {
}
}
void INIFile::allowNonEnglishCharacters() {
_allowNonEnglishCharacters = true;
}
} // End of namespace Common

5
common/ini-file.h
View file

@ -77,7 +77,7 @@ public:
typedef List<Section> SectionList;
public:
INIFile() {}
INIFile();
~INIFile() {}
// TODO: Maybe add a copy constructor etc.?
@ -115,8 +115,11 @@ public:
void listKeyValues(StringMap &kv);
void allowNonEnglishCharacters();
private:
SectionList _sections;
bool _allowNonEnglishCharacters;
Section *getSection(const String &section);
const Section *getSection(const String &section) const;