1 files changed, 96 insertions, 82 deletions

diff --git a/lib/inifile/iniFile.cpp b/lib/inifile/iniFile.cpp
index db48ad25d..fbbf5c197 100644
--- a/lib/inifile/iniFile.cpp
+++ b/lib/inifile/iniFile.cpp
@@ -83,97 +83,102 @@ bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect)
 		}
 	}
 
-	if (getline(f, line))
+	bool IsFirstLine = true;  
+
+	while (getline(f, line))
 	{
-		// Removes UTF-8 Byte Order Markers (BOM) if, present.
-		RemoveBom(line);
+		// To be compatible with Win32, check for existence of '\r'.
+		// Win32 files have the '\r' and Unix files don't at the end of a line.
+		// 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.
 
-		do
+		// Removes UTF-8 Byte Order Markers (BOM) if, present.
+		if (IsFirstLine)
 		{
-			// To be compatible with Win32, check for existence of '\r'.
-			// Win32 files have the '\r' and Unix files don't at the end of a line.
-			// 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.
-			size_t lineLength = line.length();
-			if (lineLength == 0)
-			{
-				continue;
-			}
-			if (line[lineLength - 1] == '\r')
-			{
-				line = line.substr(0, lineLength - 1);
-			}
-
-			if (line.length() == 0)
-			{
-				continue;
-			}
+			RemoveBom(line);
+			IsFirstLine = false;
+		}
 
-			// Check that the user hasn't opened a binary file by checking the first
-			// character of each line!
-			if (!isprint(line[0]))
-			{
-				printf("%s: Binary-check failed on char %d\n", __FUNCTION__, line[0]);
-				f.close();
-				return false;
-			}
-			if ((pLeft = line.find_first_of(";#[=")) == AString::npos)
-			{
-				continue;
-			}
+		size_t lineLength = line.length();
+		if (lineLength == 0)
+		{
+			continue;
+		}
+		if (line[lineLength - 1] == '\r')
+		{
+			line = line.substr(0, lineLength - 1);
+		}
 
-			switch (line[pLeft])
-			{
-			case '[':
-			{
-						if (
-							((pRight = line.find_last_of("]")) != AString::npos) &&
-							(pRight > pLeft)
-							)
-						{
-							keyname = line.substr(pLeft + 1, pRight - pLeft - 1);
-							AddKeyName(keyname);
-						}
-						break;
-			}
+		if (line.length() == 0)
+		{
+			continue;
+		}
 
-			case '=':
-			{
-						valuename = line.substr(0, pLeft);
-						value = line.substr(pLeft + 1);
-						AddValue(keyname, valuename, value);
-						break;
-			}
+		// Check that the user hasn't opened a binary file by checking the first
+		// character of each line!
+		if (!isprint(line[0]))
+		{
+			printf("%s: Binary-check failed on char %d\n", __FUNCTION__, line[0]);
+			f.close();
+			return false;
+		}
+		if ((pLeft = line.find_first_of(";#[=")) == AString::npos)
+		{
+			continue;
+		}
 
-			case ';':
-			case '#':
-			{
-						if (names.size() == 0)
-						{
-							AddHeaderComment(line.substr(pLeft + 1));
-						}
-						else
-						{
-							AddKeyComment(keyname, line.substr(pLeft + 1));
-						}
-						break;
-			}
-			}  // switch (line[pLeft])
-		} while (getline(f, line));  // do
+		switch (line[pLeft])
+		{
+		case '[':
+		{
+					if (
+						((pRight = line.find_last_of("]")) != AString::npos) &&
+						(pRight > pLeft)
+						)
+					{
+						keyname = line.substr(pLeft + 1, pRight - pLeft - 1);
+						AddKeyName(keyname);
+					}
+					break;
+		}
 
-		f.close();
-		if (names.size() == 0)
+		case '=':
 		{
-			return false;
+					valuename = line.substr(0, pLeft);
+					value = line.substr(pLeft + 1);
+					AddValue(keyname, valuename, value);
+					break;
 		}
 
-		if (IsFromExampleRedirect)
+		case ';':
+		case '#':
 		{
-			WriteFile(FILE_IO_PREFIX + a_FileName);
+					if (names.size() == 0)
+					{
+						AddHeaderComment(line.substr(pLeft + 1));
+					}
+					else
+					{
+						AddKeyComment(keyname, line.substr(pLeft + 1));
+					}
+					break;
 		}
-		return true;
+		}  // switch (line[pLeft])
+	}  // while(getline(f, line))
+
+	f.close();
+	if (names.size() == 0)
+	{
+		return false;
+	}
+
+	if (IsFromExampleRedirect)
+	{
+		WriteFile(FILE_IO_PREFIX + a_FileName);
 	}
+
+	return true;
 }
 
 
@@ -833,14 +838,23 @@ AString cIniFile::CheckCase(const AString & s) const
 
 void cIniFile::RemoveBom(AString & a_line) const
 {
-	// The BOM sequence for UTF-8 is 0xEF,0xBB,0xBF ( In Unicode Latin I:  )
-	static const AString BOM = "" + 0xEF + 0xBB + 0xBF;
+	// 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);
 
-	// The BOM sequence, if present, is always the first three characters of the input.
-	if (a_line.compare(0, 3, BOM) == 0)
+	// If any of the first three chars do not match, return and do nothing.
+	for (int i = 0; i < 3; ++i)
 	{
-		a_line.erase(0, 3);
+		if (static_cast<unsigned char>(ref[i]) != BOM[i])
+		{
+			return;
+		}
 	}
+
+	// First three characters match; erase them.
+	a_line.erase(0, 3);
 }