summaryrefslogtreecommitdiffstats
path: root/lib/inifile
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-02-17 23:47:04 +0100
committerMattes D <github@xoft.cz>2014-02-17 23:47:04 +0100
commit7aeae734e5917c3aa1436ddd0ace99ea92ac0288 (patch)
tree9cd9a53d561412f767eb2b3e29b2214aee42c2d0 /lib/inifile
parentAdded the InfoReg plugin library file. (diff)
parentFixed comment typo (diff)
downloadcuberite-7aeae734e5917c3aa1436ddd0ace99ea92ac0288.tar
cuberite-7aeae734e5917c3aa1436ddd0ace99ea92ac0288.tar.gz
cuberite-7aeae734e5917c3aa1436ddd0ace99ea92ac0288.tar.bz2
cuberite-7aeae734e5917c3aa1436ddd0ace99ea92ac0288.tar.lz
cuberite-7aeae734e5917c3aa1436ddd0ace99ea92ac0288.tar.xz
cuberite-7aeae734e5917c3aa1436ddd0ace99ea92ac0288.tar.zst
cuberite-7aeae734e5917c3aa1436ddd0ace99ea92ac0288.zip
Diffstat (limited to 'lib/inifile')
-rw-r--r--lib/inifile/iniFile.cpp38
-rw-r--r--lib/inifile/iniFile.h2
2 files changed, 39 insertions, 1 deletions
diff --git a/lib/inifile/iniFile.cpp b/lib/inifile/iniFile.cpp
index afa1c110d..cf8b63987 100644
--- a/lib/inifile/iniFile.cpp
+++ b/lib/inifile/iniFile.cpp
@@ -83,6 +83,8 @@ bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect)
}
}
+ bool IsFirstLine = true;
+
while (getline(f, line))
{
// To be compatible with Win32, check for existence of '\r'.
@@ -90,6 +92,14 @@ bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect)
// Note that the '\r' will be written to INI files from
// Unix so that the created INI file can be read under Win32
// without change.
+
+ // Removes UTF-8 Byte Order Markers (BOM) if, present.
+ if (IsFirstLine)
+ {
+ RemoveBom(line);
+ IsFirstLine = false;
+ }
+
size_t lineLength = line.length();
if (lineLength == 0)
{
@@ -162,11 +172,12 @@ bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect)
{
return false;
}
-
+
if (IsFromExampleRedirect)
{
WriteFile(FILE_IO_PREFIX + a_FileName);
}
+
return true;
}
@@ -824,3 +835,28 @@ AString cIniFile::CheckCase(const AString & s) const
+
+void cIniFile::RemoveBom(AString & a_line) const
+{
+ // The BOM sequence for UTF-8 is 0xEF,0xBB,0xBF
+ static unsigned const char BOM[] = { 0xEF, 0xBB, 0xBF };
+
+ // The BOM sequence, if present, is always th e first three characters of the input.
+ const AString ref = a_line.substr(0, 3);
+
+ // If any of the first three chars do not match, return and do nothing.
+ for (int i = 0; i < 3; ++i)
+ {
+ if (static_cast<unsigned char>(ref[i]) != BOM[i])
+ {
+ return;
+ }
+ }
+
+ // First three characters match; erase them.
+ a_line.erase(0, 3);
+}
+
+
+
+
diff --git a/lib/inifile/iniFile.h b/lib/inifile/iniFile.h
index 40af618dc..0bf1d917e 100644
--- a/lib/inifile/iniFile.h
+++ b/lib/inifile/iniFile.h
@@ -51,6 +51,8 @@ private:
/// If the object is case-insensitive, returns s as lowercase; otherwise returns s as-is
AString CheckCase(const AString & s) const;
+ /// Removes the UTF-8 BOMs (Byte order makers), if present.
+ void RemoveBom(AString & a_line) const;
public:
enum errors
{