From 449d08cb3d1a8ef430430790fcea0ce36b713866 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 23 Oct 2014 15:15:10 +0200 Subject: Merged IniFile into main MCS sources. --- CMakeLists.txt | 1 - lib/inifile/CMakeLists.txt | 11 - lib/inifile/iniFile.cpp | 908 --------------------------------- lib/inifile/iniFile.h | 224 -------- src/Bindings/AllToLua.pkg | 2 +- src/Bindings/PluginManager.cpp | 2 +- src/BlockID.cpp | 2 +- src/CMakeLists.txt | 4 +- src/Entities/Player.cpp | 2 +- src/Generating/BioGen.cpp | 2 +- src/Generating/ChunkGenerator.cpp | 2 +- src/Generating/CompoGen.cpp | 2 +- src/Generating/ComposableGenerator.cpp | 2 +- src/Generating/DistortedHeightmap.cpp | 2 +- src/Generating/EndGen.cpp | 2 +- src/Generating/FinishGen.cpp | 2 +- src/Generating/HeiGen.cpp | 2 +- src/Generating/Noise3DGenerator.cpp | 2 +- src/HTTPServer/HTTPServer.h | 2 +- src/IniFile.cpp | 908 +++++++++++++++++++++++++++++++++ src/IniFile.h | 224 ++++++++ src/MonsterConfig.cpp | 2 +- src/Protocol/Authenticator.cpp | 2 +- src/Protocol/MojangAPI.cpp | 2 +- src/RCONServer.cpp | 2 +- src/RankManager.cpp | 2 +- src/Root.cpp | 5 +- src/Server.cpp | 2 +- src/Simulator/SandSimulator.cpp | 2 +- src/WebAdmin.h | 2 +- src/World.cpp | 2 +- 31 files changed, 1160 insertions(+), 1171 deletions(-) delete mode 100644 lib/inifile/CMakeLists.txt delete mode 100644 lib/inifile/iniFile.cpp delete mode 100644 lib/inifile/iniFile.h create mode 100644 src/IniFile.cpp create mode 100644 src/IniFile.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 188cf81e3..66281fe0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,6 @@ set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "Build and run tests." set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "Add the internal SQLite3 source to the project." FORCE) # Include all the libraries: -add_subdirectory(lib/inifile/) add_subdirectory(lib/jsoncpp/) add_subdirectory(lib/zlib/) add_subdirectory(lib/lua/) diff --git a/lib/inifile/CMakeLists.txt b/lib/inifile/CMakeLists.txt deleted file mode 100644 index 321d501d7..000000000 --- a/lib/inifile/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required (VERSION 2.6) -project (iniFile) - -include_directories ("${PROJECT_SOURCE_DIR}/../../src/") - -file(GLOB SOURCE - "*.h" - "*.cpp" -) - -add_library(iniFile ${SOURCE}) diff --git a/lib/inifile/iniFile.cpp b/lib/inifile/iniFile.cpp deleted file mode 100644 index 7cfe7661f..000000000 --- a/lib/inifile/iniFile.cpp +++ /dev/null @@ -1,908 +0,0 @@ -// IniFile.cpp: Implementation of the CIniFile class. -// Written by: Adam Clauss -// Email: cabadam@houston.rr.com -// You may use this class/code as you wish in your programs. Feel free to distribute it, and -// email suggested changes to me. -// -// Rewritten by: Shane Hill -// Date: 21/08/2001 -// Email: Shane.Hill@dsto.defence.gov.au -// Reason: Remove dependancy on MFC. Code should compile on any -// platform. -////////////////////////////////////////////////////////////////////// - -/* -!! MODIFIED BY FAKETRUTH and xoft !! -*/ - -#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules - -// C++ Includes -#include - -// C Includes -#include - -// Local Includes -#include "iniFile.h" - -#if defined(WIN32) - #define iniEOL endl -#else - #define iniEOL '\r' << endl -#endif - -#ifndef _WIN32 - #define sscanf_s(buffer, stringbuffer, ...) (sscanf(buffer, stringbuffer, __VA_ARGS__)) -#endif - -using namespace std; - - - - - -cIniFile::cIniFile(void) : - m_IsCaseInsensitive(true) -{ -} - - - - - -bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect) -{ - // Normally you would use ifstream, but the SGI CC compiler has - // a few bugs with ifstream. So ... fstream used. - fstream f; - AString line; - AString keyname, valuename, value; - AString::size_type pLeft, pRight; - bool IsFromExampleRedirect = false; - - f.open((FILE_IO_PREFIX + a_FileName).c_str(), ios::in); - if (f.fail()) - { - f.clear(); - if (a_AllowExampleRedirect) - { - // Retry with the .example.ini file instead of .ini: - AString ExPath(a_FileName.substr(0, a_FileName.length() - 4)); - ExPath.append(".example.ini"); - f.open((FILE_IO_PREFIX + ExPath).c_str(), ios::in); - if (f.fail()) - { - return false; - } - IsFromExampleRedirect = true; - } - else - { - return false; - } - } - - bool IsFirstLine = true; - - while (getline(f, 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. - - // Removes UTF-8 Byte Order Markers (BOM) if, present. - if (IsFirstLine) - { - RemoveBom(line); - IsFirstLine = false; - } - - 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; - } - - // 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; - } - - 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; - } - - case '=': - { - valuename = line.substr(0, pLeft); - value = line.substr(pLeft + 1); - AddValue(keyname, valuename, value); - break; - } - - case ';': - case '#': - { - if (names.empty()) - { - AddHeaderComment(line.substr(pLeft + 1)); - } - else - { - AddKeyComment(keyname, line.substr(pLeft + 1)); - } - break; - } - } // switch (line[pLeft]) - } // while (getline()) - - f.close(); - if (keys.empty() && names.empty() && comments.empty()) - { - // File be empty or unreadable, equivalent to nonexistant - return false; - } - - if (IsFromExampleRedirect) - { - WriteFile(FILE_IO_PREFIX + a_FileName); - } - - return true; -} - - - - - -bool cIniFile::WriteFile(const AString & a_FileName) const -{ - // Normally you would use ofstream, but the SGI CC compiler has - // a few bugs with ofstream. So ... fstream used. - fstream f; - - f.open((FILE_IO_PREFIX + a_FileName).c_str(), ios::out); - if (f.fail()) - { - return false; - } - - // Write header comments. - size_t NumComments = comments.size(); - for (size_t commentID = 0; commentID < NumComments; ++commentID) - { - f << ';' << comments[commentID] << iniEOL; - } - if (NumComments > 0) - { - f << iniEOL; - } - - // Write keys and values. - for (size_t keyID = 0; keyID < keys.size(); ++keyID) - { - f << '[' << names[keyID] << ']' << iniEOL; - - // Comments. - for (size_t commentID = 0; commentID < keys[keyID].comments.size(); ++commentID) - { - f << ';' << keys[keyID].comments[commentID] << iniEOL; - } - - // Values. - for (size_t valueID = 0; valueID < keys[keyID].names.size(); ++valueID) - { - f << keys[keyID].names[valueID] << '=' << keys[keyID].values[valueID] << iniEOL; - } - f << iniEOL; - } - f.close(); - - return true; -} - - - - - -int cIniFile::FindKey(const AString & a_KeyName) const -{ - AString CaseKeyName = CheckCase(a_KeyName); - for (size_t keyID = 0; keyID < names.size(); ++keyID) - { - if (CheckCase(names[keyID]) == CaseKeyName) - { - return (int)keyID; - } - } - return noID; -} - - - - - -int cIniFile::FindValue(const int keyID, const AString & a_ValueName) const -{ - if (!keys.size() || (keyID >= (int)keys.size())) - { - return noID; - } - - AString CaseValueName = CheckCase(a_ValueName); - for (size_t valueID = 0; valueID < keys[keyID].names.size(); ++valueID) - { - if (CheckCase(keys[keyID].names[valueID]) == CaseValueName) - { - return int(valueID); - } - } - return noID; -} - - - - - -int cIniFile::AddKeyName(const AString & keyname) -{ - names.resize(names.size() + 1, keyname); - keys.resize(keys.size() + 1); - return (int)names.size() - 1; -} - - - - - -AString cIniFile::GetKeyName(const int keyID) const -{ - if (keyID < (int)names.size()) - { - return names[keyID]; - } - else - { - return ""; - } -} - - - - - -int cIniFile::GetNumValues(const int keyID) const -{ - if (keyID < (int)keys.size()) - { - return (int)keys[keyID].names.size(); - } - return 0; -} - - - - - -int cIniFile::GetNumValues(const AString & keyname) const -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return 0; - } - return (int)keys[keyID].names.size(); -} - - - - - -AString cIniFile::GetValueName(const int keyID, const int valueID) const -{ - if ((keyID < (int)keys.size()) && (valueID < (int)keys[keyID].names.size())) - { - return keys[keyID].names[valueID]; - } - return ""; -} - - - - - -AString cIniFile::GetValueName(const AString & keyname, const int valueID) const -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return ""; - } - return GetValueName(keyID, valueID); -} - - - - - -void cIniFile::AddValue(const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value) -{ - int keyID = FindKey(a_KeyName); - if (keyID == noID) - { - keyID = int(AddKeyName(a_KeyName)); - } - - keys[keyID].names.push_back(a_ValueName); - keys[keyID].values.push_back(a_Value); -} - - - - - -void cIniFile::AddValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value) -{ - AddValue(a_KeyName, a_ValueName, Printf("%d", a_Value)); -} - - - - - -void cIniFile::AddValueF(const AString & a_KeyName, const AString & a_ValueName, const double a_Value) -{ - AddValue(a_KeyName, a_ValueName, Printf("%f", a_Value)); -} - - - - - -bool cIniFile::SetValue(const int keyID, const int valueID, const AString & value) -{ - if (((size_t)keyID >= keys.size()) || ((size_t)valueID >= keys[keyID].names.size())) - { - return false; - } - keys[keyID].values[valueID] = value; - return true; -} - - - - - -bool cIniFile::SetValue(const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value, const bool a_CreateIfNotExists) -{ - int keyID = FindKey(a_KeyName); - if (keyID == noID) - { - if (!a_CreateIfNotExists) - { - return false; - } - keyID = AddKeyName(a_KeyName); - } - - int valueID = FindValue(keyID, a_ValueName); - if (valueID == noID) - { - if (!a_CreateIfNotExists) - { - return false; - } - keys[keyID].names.push_back(a_ValueName); - keys[keyID].values.push_back(a_Value); - } - else - { - keys[keyID].values[valueID] = a_Value; - } - - return true; -} - - - - - -bool cIniFile::SetValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value, const bool a_CreateIfNotExists) -{ - return SetValue(a_KeyName, a_ValueName, Printf("%d", a_Value), a_CreateIfNotExists); -} - - - - - -bool cIniFile::SetValueI(const AString & a_Keyname, const AString & a_ValueName, const Int64 a_Value, const bool a_CreateIfNotExists) -{ - return SetValue(a_Keyname, a_ValueName, Printf("%lld", a_Value), a_CreateIfNotExists); -} - - - - - -bool cIniFile::SetValueF(const AString & a_KeyName, const AString & a_ValueName, double const a_Value, const bool a_CreateIfNotExists) -{ - return SetValue(a_KeyName, a_ValueName, Printf("%f", a_Value), a_CreateIfNotExists); -} - - - - - -bool cIniFile::SetValueV(const AString & a_KeyName, const AString & a_ValueName, const char * a_Format, ...) -{ - va_list args; - va_start(args, a_Format); - AString Data; - AppendVPrintf(Data, a_Format, args); - va_end(args); - return SetValue(a_KeyName, a_ValueName, Data); -} - - - - - -AString cIniFile::GetValue(const int keyID, const int valueID, const AString & defValue) const -{ - if ((keyID < (int)keys.size()) && (valueID < (int)keys[keyID].names.size())) - { - return keys[keyID].values[valueID]; - } - return defValue; -} - - - - - -AString cIniFile::GetValue(const AString & keyname, const AString & valuename, const AString & defValue) const -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return defValue; - } - - int valueID = FindValue(int(keyID), valuename); - if (valueID == noID) - { - return defValue; - } - - return keys[keyID].values[valueID]; -} - - - - - -int cIniFile::GetValueI(const AString & keyname, const AString & valuename, const int defValue) const -{ - AString Data; - Printf(Data, "%d", defValue); - return atoi(GetValue(keyname, valuename, Data).c_str()); -} - - - - - -double cIniFile::GetValueF(const AString & keyname, const AString & valuename, double const defValue) const -{ - AString Data; - Printf(Data, "%f", defValue); - return atof(GetValue(keyname, valuename, Data).c_str()); -} - - - - - -AString cIniFile::GetValueSet(const AString & keyname, const AString & valuename, const AString & defValue) -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - SetValue(keyname, valuename, defValue); - return defValue; - } - - int valueID = FindValue(int(keyID), valuename); - if (valueID == noID) - { - SetValue(keyname, valuename, defValue); - return defValue; - } - - return keys[keyID].values[valueID]; -} - - - - - -double cIniFile::GetValueSetF(const AString & keyname, const AString & valuename, const double defValue) -{ - AString Data; - Printf(Data, "%f", defValue); - return atof(GetValueSet(keyname, valuename, Data).c_str()); -} - - - - - -int cIniFile::GetValueSetI(const AString & keyname, const AString & valuename, const int defValue) -{ - AString Data; - Printf(Data, "%d", defValue); - return atoi(GetValueSet(keyname, valuename, Data).c_str()); -} - - - - - -Int64 cIniFile::GetValueSetI(const AString & keyname, const AString & valuename, const Int64 defValue) -{ - AString Data; - Printf(Data, "%lld", defValue); - AString resultstring = GetValueSet(keyname, valuename, Data); - Int64 result = defValue; -#ifdef _WIN32 - sscanf_s(resultstring.c_str(), "%lld", &result); -#else - sscanf(resultstring.c_str(), "%lld", &result); -#endif - return result; -} - - - - - -bool cIniFile::DeleteValueByID(const int keyID, const int valueID) -{ - if ((keyID < (int)keys.size()) && (valueID < (int)keys[keyID].names.size())) - { - // This looks strange, but is neccessary. - vector::iterator npos = keys[keyID].names.begin() + valueID; - vector::iterator vpos = keys[keyID].values.begin() + valueID; - keys[keyID].names.erase(npos, npos + 1); - keys[keyID].values.erase(vpos, vpos + 1); - return true; - } - return false; -} - - - - - -bool cIniFile::DeleteValue(const AString & keyname, const AString & valuename) -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return false; - } - - int valueID = FindValue(int(keyID), valuename); - if (valueID == noID) - { - return false; - } - - return DeleteValueByID(keyID, valueID); -} - - - - - -bool cIniFile::DeleteKey(const AString & keyname) -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return false; - } - - vector::iterator npos = names.begin() + keyID; - vector::iterator kpos = keys.begin() + keyID; - names.erase(npos, npos + 1); - keys.erase(kpos, kpos + 1); - - return true; -} - - - - - -void cIniFile::Clear(void) -{ - names.clear(); - keys.clear(); - comments.clear(); -} - - - - - -bool cIniFile::HasValue(const AString & a_KeyName, const AString & a_ValueName) -{ - // Find the key: - int keyID = FindKey(a_KeyName); - if (keyID == noID) - { - return false; - } - - // Find the value: - int valueID = FindValue(keyID, a_ValueName); - return (valueID != noID); -} - - - - - -void cIniFile::AddHeaderComment(const AString & comment) -{ - comments.push_back(comment); - // comments.resize(comments.size() + 1, comment); -} - - - - - -AString cIniFile::GetHeaderComment(const int commentID) const -{ - if (commentID < (int)comments.size()) - { - return comments[commentID]; - } - return ""; -} - - - - - -bool cIniFile::DeleteHeaderComment(int commentID) -{ - if (commentID < (int)comments.size()) - { - vector::iterator cpos = comments.begin() + commentID; - comments.erase(cpos, cpos + 1); - return true; - } - return false; -} - - - - - -int cIniFile::GetNumKeyComments(const int keyID) const -{ - if (keyID < (int)keys.size()) - { - return (int)keys[keyID].comments.size(); - } - return 0; -} - - - - - -int cIniFile::GetNumKeyComments(const AString & keyname) const -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return 0; - } - return (int)keys[keyID].comments.size(); -} - - - - - -bool cIniFile::AddKeyComment(const int keyID, const AString & comment) -{ - if (keyID < (int)keys.size()) - { - keys[keyID].comments.resize(keys[keyID].comments.size() + 1, comment); - return true; - } - return false; -} - - - - - -bool cIniFile::AddKeyComment(const AString & keyname, const AString & comment) -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return false; - } - return AddKeyComment(keyID, comment); -} - - - - - -AString cIniFile::GetKeyComment(const int keyID, const int commentID) const -{ - if ((keyID < (int)keys.size()) && (commentID < (int)keys[keyID].comments.size())) - { - return keys[keyID].comments[commentID]; - } - return ""; -} - - - - - -AString cIniFile::GetKeyComment(const AString & keyname, const int commentID) const -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return ""; - } - return GetKeyComment(int(keyID), commentID); -} - - - - - -bool cIniFile::DeleteKeyComment(const int keyID, const int commentID) -{ - if ((keyID < (int)keys.size()) && (commentID < (int)keys[keyID].comments.size())) - { - vector::iterator cpos = keys[keyID].comments.begin() + commentID; - keys[keyID].comments.erase(cpos, cpos + 1); - return true; - } - return false; -} - - - - - -bool cIniFile::DeleteKeyComment(const AString & keyname, const int commentID) -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return false; - } - return DeleteKeyComment(int(keyID), commentID); -} - - - - - -bool cIniFile::DeleteKeyComments(const int keyID) -{ - if (keyID < (int)keys.size()) - { - keys[keyID].comments.clear(); - return true; - } - return false; -} - - - - - -bool cIniFile::DeleteKeyComments(const AString & keyname) -{ - int keyID = FindKey(keyname); - if (keyID == noID) - { - return false; - } - return DeleteKeyComments(int(keyID)); -} - - - - - -AString cIniFile::CheckCase(const AString & s) const -{ - if (!m_IsCaseInsensitive) - { - return s; - } - AString res(s); - size_t len = res.length(); - for (size_t i = 0; i < len; i++) - { - res[i] = tolower(res[i]); - } - return res; -} - - - - - -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(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 deleted file mode 100644 index 33229bff0..000000000 --- a/lib/inifile/iniFile.h +++ /dev/null @@ -1,224 +0,0 @@ -// IniFile.cpp: Implementation of the CIniFile class. -// Written by: Adam Clauss -// Email: cabadam@tamu.edu -// You may use this class/code as you wish in your programs. Feel free to distribute it, and -// email suggested changes to me. -// -// Rewritten by: Shane Hill -// Date: 21/08/2001 -// Email: Shane.Hill@dsto.defence.gov.au -// Reason: Remove dependancy on MFC. Code should compile on any -// platform. Tested on Windows/Linux/Irix -////////////////////////////////////////////////////////////////////// - -/* -!! MODIFIED BY FAKETRUTH and madmaxoft!! -*/ - -#ifndef CIniFile_H -#define CIniFile_H - - - - - -#define MAX_KEYNAME 128 -#define MAX_VALUENAME 128 -#define MAX_VALUEDATA 2048 - - - - - -// tolua_begin - -class cIniFile -{ -private: - bool m_IsCaseInsensitive; - - struct key - { - std::vector names; - std::vector values; - std::vector comments; - } ; - - std::vector keys; - std::vector names; - std::vector comments; - - /// 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 - { - noID = -1, - }; - - /// Creates a new instance with no data - cIniFile(void); - - // Sets whether or not keynames and valuenames should be case sensitive. - // The default is case insensitive. - void CaseSensitive (void) { m_IsCaseInsensitive = false; } - void CaseInsensitive(void) { m_IsCaseInsensitive = true; } - - /** Reads the contents of the specified ini file - If the file doesn't exist and a_AllowExampleRedirect is true, tries to read .example.ini, and - writes its contents as .ini, if successful. - Returns true if successful, false otherwise. - */ - bool ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect = true); - - /// Writes data stored in class to the specified ini file - bool WriteFile(const AString & a_FileName) const; - - /// Deletes all stored ini data (but doesn't touch the file) - void Clear(void); - - /** Returns true iff the specified value exists. */ - bool HasValue(const AString & a_KeyName, const AString & a_ValueName); - - /// Returns index of specified key, or noID if not found - int FindKey(const AString & keyname) const; - - /// Returns index of specified value, in the specified key, or noID if not found - int FindValue(const int keyID, const AString & valuename) const; - - /// Returns number of keys currently in the ini - int GetNumKeys(void) const { return (int)keys.size(); } - - /// Add a key name - int AddKeyName(const AString & keyname); - - // Returns key names by index. - AString GetKeyName(const int keyID) const; - - // Returns number of values stored for specified key. - int GetNumValues(const AString & keyname) const; - int GetNumValues(const int keyID) const; - - // Returns value name by index for a given keyname or keyID. - AString GetValueName(const AString & keyname, const int valueID) const; - AString GetValueName(const int keyID, const int valueID) const; - - // Gets value of [keyname] valuename =. - // Overloaded to return string, int, and double. - // Returns defValue if key/value not found. - AString GetValue (const AString & keyname, const AString & valuename, const AString & defValue = "") const; - AString GetValue (const int keyID, const int valueID, const AString & defValue = "") const; - double GetValueF(const AString & keyname, const AString & valuename, const double defValue = 0) const; - int GetValueI(const AString & keyname, const AString & valuename, const int defValue = 0) const; - bool GetValueB(const AString & keyname, const AString & valuename, const bool defValue = false) const - { - return (GetValueI(keyname, valuename, defValue ? 1 : 0) != 0); - } - - // Gets the value; if not found, write the default to the INI file - AString GetValueSet (const AString & keyname, const AString & valuename, const AString & defValue = ""); - double GetValueSetF(const AString & keyname, const AString & valuename, const double defValue = 0.0); - int GetValueSetI(const AString & keyname, const AString & valuename, const int defValue = 0); - Int64 GetValueSetI(const AString & keyname, const AString & valuename, const Int64 defValue = 0); - bool GetValueSetB(const AString & keyname, const AString & valuename, const bool defValue = false) - { - return (GetValueSetI(keyname, valuename, defValue ? 1 : 0) != 0); - } - - // Adds a new value to the specified key. - // If a value of the same name already exists, creates another one (non-standard INI file) - void AddValue (const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value); - void AddValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value); - void AddValueB(const AString & a_KeyName, const AString & a_ValueName, const bool a_Value) - { - return AddValueI(a_KeyName, a_ValueName, a_Value ? 1 : 0); - } - void AddValueF(const AString & a_KeyName, const AString & a_ValueName, const double a_Value); - - // Overwrites the value of [keyname].valuename - // Specify the optional parameter as false (0) if you do not want the value created if it doesn't exist. - // Returns true if value set, false otherwise. - // Overloaded to accept string, int, and double. - bool SetValue (const int keyID, const int valueID, const AString & value); - bool SetValue (const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value, const bool a_CreateIfNotExists = true); - bool SetValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value, const bool a_CreateIfNotExists = true); - bool SetValueI(const AString & a_Keyname, const AString & a_ValueName, const Int64 a_Value, const bool a_CreateIfNotExists = true); - bool SetValueB(const AString & a_KeyName, const AString & a_ValueName, const bool a_Value, const bool a_CreateIfNotExists = true) - { - return SetValueI(a_KeyName, a_ValueName, int(a_Value), a_CreateIfNotExists); - } - bool SetValueF(const AString & a_KeyName, const AString & a_ValueName, const double a_Value, const bool a_CreateIfNotExists = true); - - // tolua_end - - bool SetValueV( const AString & a_KeyName, const AString & a_ValueName, const char * a_Format, ...); - - // tolua_begin - - // Deletes specified value. - // Returns true if value existed and deleted, false otherwise. - bool DeleteValueByID(const int keyID, const int valueID); - bool DeleteValue(const AString & keyname, const AString & valuename); - - // Deletes specified key and all values contained within. - // Returns true if key existed and deleted, false otherwise. - bool DeleteKey(const AString & keyname); - - // Header comment functions. - // Header comments are those comments before the first key. - - /// Returns the number of header comments - int GetNumHeaderComments(void) {return (int)comments.size();} - - /// Adds a header comment - void AddHeaderComment(const AString & comment); - - /// Returns a header comment, or empty string if out of range - AString GetHeaderComment(const int commentID) const; - - /// Deletes a header comment. Returns true if successful - bool DeleteHeaderComment(int commentID); - - /// Deletes all header comments - void DeleteHeaderComments(void) {comments.clear();} - - - // Key comment functions. - // Key comments are those comments within a key. Any comments - // defined within value names will be added to this list. Therefore, - // these comments will be moved to the top of the key definition when - // the CIniFile::WriteFile() is called. - - /// Get number of key comments - int GetNumKeyComments(const int keyID) const; - - /// Get number of key comments - int GetNumKeyComments(const AString & keyname) const; - - /// Add a key comment - bool AddKeyComment(const int keyID, const AString & comment); - - /// Add a key comment - bool AddKeyComment(const AString & keyname, const AString & comment); - - /// Return a key comment - AString GetKeyComment(const int keyID, const int commentID) const; - AString GetKeyComment(const AString & keyname, const int commentID) const; - - // Delete a key comment. - bool DeleteKeyComment(const int keyID, const int commentID); - bool DeleteKeyComment(const AString & keyname, const int commentID); - - // Delete all comments for a key. - bool DeleteKeyComments(const int keyID); - bool DeleteKeyComments(const AString & keyname); -}; - -// tolua_end - -#endif diff --git a/src/Bindings/AllToLua.pkg b/src/Bindings/AllToLua.pkg index 1bff26b0e..7b78578ee 100644 --- a/src/Bindings/AllToLua.pkg +++ b/src/Bindings/AllToLua.pkg @@ -15,7 +15,7 @@ $cfile "../Vector3.h" $cfile "../ChunkDef.h" $cfile "../BiomeDef.h" -$cfile "../../lib/inifile/iniFile.h" +$cfile "../IniFile.h" $cfile "../OSSupport/File.h" diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp index e549aefa3..f63578885 100644 --- a/src/Bindings/PluginManager.cpp +++ b/src/Bindings/PluginManager.cpp @@ -9,7 +9,7 @@ #include "../Server.h" #include "../CommandOutput.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "../Entities/Player.h" #define FIND_HOOK(a_HookName) HookMap::iterator Plugins = m_Hooks.find(a_HookName); diff --git a/src/BlockID.cpp b/src/BlockID.cpp index 755c721db..c0f3193bb 100644 --- a/src/BlockID.cpp +++ b/src/BlockID.cpp @@ -4,7 +4,7 @@ #include "Globals.h" #include "BlockID.h" -#include "inifile/iniFile.h" +#include "IniFile.h" #include "Item.h" #include "Mobs/Monster.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d0e2cede..096fa824d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,6 +34,7 @@ SET (SRCS FastRandom.cpp FurnaceRecipe.cpp Globals.cpp + IniFile.cpp Inventory.cpp Item.cpp ItemGrid.cpp @@ -98,6 +99,7 @@ SET (HDRS ForEachChunkProvider.h FurnaceRecipe.h Globals.h + IniFile.h Inventory.h Item.h ItemGrid.h @@ -320,4 +322,4 @@ endif () if (WIN32) target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib) endif() -target_link_libraries(${EXECUTABLE} luaexpat iniFile jsoncpp polarssl zlib sqlite lua SQLiteCpp) +target_link_libraries(${EXECUTABLE} luaexpat jsoncpp polarssl zlib sqlite lua SQLiteCpp) diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 790147fd3..1f1627f8a 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -20,7 +20,7 @@ #include "../WorldStorage/StatSerializer.h" #include "../CompositeChat.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "json/json.h" // 6000 ticks or 5 minutes diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp index d86d44bbc..203faff56 100644 --- a/src/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "BioGen.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp index 1eecd6e51..92e1bb31d 100644 --- a/src/Generating/ChunkGenerator.cpp +++ b/src/Generating/ChunkGenerator.cpp @@ -2,7 +2,7 @@ #include "Globals.h" #include "ChunkGenerator.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "ChunkDesc.h" #include "ComposableGenerator.h" #include "Noise3DGenerator.h" diff --git a/src/Generating/CompoGen.cpp b/src/Generating/CompoGen.cpp index 2c88f23f1..29b831dfd 100644 --- a/src/Generating/CompoGen.cpp +++ b/src/Generating/CompoGen.cpp @@ -12,7 +12,7 @@ #include "../BlockID.h" #include "../Item.h" #include "../LinearUpscale.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp index 9a52588d5..169821050 100644 --- a/src/Generating/ComposableGenerator.cpp +++ b/src/Generating/ComposableGenerator.cpp @@ -7,7 +7,7 @@ #include "ComposableGenerator.h" #include "../World.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "../Root.h" // Individual composed algorithms: diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp index e6849fadf..aac1d2bf3 100644 --- a/src/Generating/DistortedHeightmap.cpp +++ b/src/Generating/DistortedHeightmap.cpp @@ -7,7 +7,7 @@ #include "DistortedHeightmap.h" #include "../OSSupport/File.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/EndGen.cpp b/src/Generating/EndGen.cpp index c94cd1eff..0111d2fa3 100644 --- a/src/Generating/EndGen.cpp +++ b/src/Generating/EndGen.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "EndGen.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp index 96e3dc26b..0564789dc 100644 --- a/src/Generating/FinishGen.cpp +++ b/src/Generating/FinishGen.cpp @@ -15,7 +15,7 @@ #include "../Simulator/FluidSimulator.h" // for cFluidSimulator::CanWashAway() #include "../Simulator/FireSimulator.h" #include "../World.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp index acfefaefc..a0b8770f5 100644 --- a/src/Generating/HeiGen.cpp +++ b/src/Generating/HeiGen.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "HeiGen.h" #include "../LinearUpscale.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "DistortedHeightmap.h" #include "EndGen.h" #include "Noise3DGenerator.h" diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp index c3ca30384..5a4cb44cf 100644 --- a/src/Generating/Noise3DGenerator.cpp +++ b/src/Generating/Noise3DGenerator.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "Noise3DGenerator.h" #include "../OSSupport/File.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "../LinearInterpolation.h" #include "../LinearUpscale.h" diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h index 522b7da62..73d4cbdd0 100644 --- a/src/HTTPServer/HTTPServer.h +++ b/src/HTTPServer/HTTPServer.h @@ -11,7 +11,7 @@ #include "../OSSupport/ListenThread.h" #include "../OSSupport/SocketThreads.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "PolarSSL++/RsaPrivateKey.h" #include "PolarSSL++/CryptoKey.h" #include "PolarSSL++/X509Cert.h" diff --git a/src/IniFile.cpp b/src/IniFile.cpp new file mode 100644 index 000000000..517fd36af --- /dev/null +++ b/src/IniFile.cpp @@ -0,0 +1,908 @@ +// IniFile.cpp: Implementation of the CIniFile class. +// Written by: Adam Clauss +// Email: cabadam@houston.rr.com +// You may use this class/code as you wish in your programs. Feel free to distribute it, and +// email suggested changes to me. +// +// Rewritten by: Shane Hill +// Date: 21/08/2001 +// Email: Shane.Hill@dsto.defence.gov.au +// Reason: Remove dependancy on MFC. Code should compile on any +// platform. +////////////////////////////////////////////////////////////////////// + +/* +!! MODIFIED BY FAKETRUTH and xoft !! +*/ + +#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules + +// C++ Includes +#include + +// C Includes +#include + +// Local Includes +#include "IniFile.h" + +#if defined(WIN32) + #define iniEOL endl +#else + #define iniEOL '\r' << endl +#endif + +#ifndef _WIN32 + #define sscanf_s(buffer, stringbuffer, ...) (sscanf(buffer, stringbuffer, __VA_ARGS__)) +#endif + +using namespace std; + + + + + +cIniFile::cIniFile(void) : + m_IsCaseInsensitive(true) +{ +} + + + + + +bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect) +{ + // Normally you would use ifstream, but the SGI CC compiler has + // a few bugs with ifstream. So ... fstream used. + fstream f; + AString line; + AString keyname, valuename, value; + AString::size_type pLeft, pRight; + bool IsFromExampleRedirect = false; + + f.open((FILE_IO_PREFIX + a_FileName).c_str(), ios::in); + if (f.fail()) + { + f.clear(); + if (a_AllowExampleRedirect) + { + // Retry with the .example.ini file instead of .ini: + AString ExPath(a_FileName.substr(0, a_FileName.length() - 4)); + ExPath.append(".example.ini"); + f.open((FILE_IO_PREFIX + ExPath).c_str(), ios::in); + if (f.fail()) + { + return false; + } + IsFromExampleRedirect = true; + } + else + { + return false; + } + } + + bool IsFirstLine = true; + + while (getline(f, 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. + + // Removes UTF-8 Byte Order Markers (BOM) if, present. + if (IsFirstLine) + { + RemoveBom(line); + IsFirstLine = false; + } + + 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; + } + + // 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; + } + + 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; + } + + case '=': + { + valuename = line.substr(0, pLeft); + value = line.substr(pLeft + 1); + AddValue(keyname, valuename, value); + break; + } + + case ';': + case '#': + { + if (names.empty()) + { + AddHeaderComment(line.substr(pLeft + 1)); + } + else + { + AddKeyComment(keyname, line.substr(pLeft + 1)); + } + break; + } + } // switch (line[pLeft]) + } // while (getline()) + + f.close(); + if (keys.empty() && names.empty() && comments.empty()) + { + // File be empty or unreadable, equivalent to nonexistant + return false; + } + + if (IsFromExampleRedirect) + { + WriteFile(FILE_IO_PREFIX + a_FileName); + } + + return true; +} + + + + + +bool cIniFile::WriteFile(const AString & a_FileName) const +{ + // Normally you would use ofstream, but the SGI CC compiler has + // a few bugs with ofstream. So ... fstream used. + fstream f; + + f.open((FILE_IO_PREFIX + a_FileName).c_str(), ios::out); + if (f.fail()) + { + return false; + } + + // Write header comments. + size_t NumComments = comments.size(); + for (size_t commentID = 0; commentID < NumComments; ++commentID) + { + f << ';' << comments[commentID] << iniEOL; + } + if (NumComments > 0) + { + f << iniEOL; + } + + // Write keys and values. + for (size_t keyID = 0; keyID < keys.size(); ++keyID) + { + f << '[' << names[keyID] << ']' << iniEOL; + + // Comments. + for (size_t commentID = 0; commentID < keys[keyID].comments.size(); ++commentID) + { + f << ';' << keys[keyID].comments[commentID] << iniEOL; + } + + // Values. + for (size_t valueID = 0; valueID < keys[keyID].names.size(); ++valueID) + { + f << keys[keyID].names[valueID] << '=' << keys[keyID].values[valueID] << iniEOL; + } + f << iniEOL; + } + f.close(); + + return true; +} + + + + + +int cIniFile::FindKey(const AString & a_KeyName) const +{ + AString CaseKeyName = CheckCase(a_KeyName); + for (size_t keyID = 0; keyID < names.size(); ++keyID) + { + if (CheckCase(names[keyID]) == CaseKeyName) + { + return (int)keyID; + } + } + return noID; +} + + + + + +int cIniFile::FindValue(const int keyID, const AString & a_ValueName) const +{ + if (!keys.size() || (keyID >= (int)keys.size())) + { + return noID; + } + + AString CaseValueName = CheckCase(a_ValueName); + for (size_t valueID = 0; valueID < keys[keyID].names.size(); ++valueID) + { + if (CheckCase(keys[keyID].names[valueID]) == CaseValueName) + { + return int(valueID); + } + } + return noID; +} + + + + + +int cIniFile::AddKeyName(const AString & keyname) +{ + names.resize(names.size() + 1, keyname); + keys.resize(keys.size() + 1); + return (int)names.size() - 1; +} + + + + + +AString cIniFile::GetKeyName(const int keyID) const +{ + if (keyID < (int)names.size()) + { + return names[keyID]; + } + else + { + return ""; + } +} + + + + + +int cIniFile::GetNumValues(const int keyID) const +{ + if (keyID < (int)keys.size()) + { + return (int)keys[keyID].names.size(); + } + return 0; +} + + + + + +int cIniFile::GetNumValues(const AString & keyname) const +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return 0; + } + return (int)keys[keyID].names.size(); +} + + + + + +AString cIniFile::GetValueName(const int keyID, const int valueID) const +{ + if ((keyID < (int)keys.size()) && (valueID < (int)keys[keyID].names.size())) + { + return keys[keyID].names[valueID]; + } + return ""; +} + + + + + +AString cIniFile::GetValueName(const AString & keyname, const int valueID) const +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return ""; + } + return GetValueName(keyID, valueID); +} + + + + + +void cIniFile::AddValue(const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value) +{ + int keyID = FindKey(a_KeyName); + if (keyID == noID) + { + keyID = int(AddKeyName(a_KeyName)); + } + + keys[keyID].names.push_back(a_ValueName); + keys[keyID].values.push_back(a_Value); +} + + + + + +void cIniFile::AddValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value) +{ + AddValue(a_KeyName, a_ValueName, Printf("%d", a_Value)); +} + + + + + +void cIniFile::AddValueF(const AString & a_KeyName, const AString & a_ValueName, const double a_Value) +{ + AddValue(a_KeyName, a_ValueName, Printf("%f", a_Value)); +} + + + + + +bool cIniFile::SetValue(const int keyID, const int valueID, const AString & value) +{ + if (((size_t)keyID >= keys.size()) || ((size_t)valueID >= keys[keyID].names.size())) + { + return false; + } + keys[keyID].values[valueID] = value; + return true; +} + + + + + +bool cIniFile::SetValue(const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value, const bool a_CreateIfNotExists) +{ + int keyID = FindKey(a_KeyName); + if (keyID == noID) + { + if (!a_CreateIfNotExists) + { + return false; + } + keyID = AddKeyName(a_KeyName); + } + + int valueID = FindValue(keyID, a_ValueName); + if (valueID == noID) + { + if (!a_CreateIfNotExists) + { + return false; + } + keys[keyID].names.push_back(a_ValueName); + keys[keyID].values.push_back(a_Value); + } + else + { + keys[keyID].values[valueID] = a_Value; + } + + return true; +} + + + + + +bool cIniFile::SetValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value, const bool a_CreateIfNotExists) +{ + return SetValue(a_KeyName, a_ValueName, Printf("%d", a_Value), a_CreateIfNotExists); +} + + + + + +bool cIniFile::SetValueI(const AString & a_Keyname, const AString & a_ValueName, const Int64 a_Value, const bool a_CreateIfNotExists) +{ + return SetValue(a_Keyname, a_ValueName, Printf("%lld", a_Value), a_CreateIfNotExists); +} + + + + + +bool cIniFile::SetValueF(const AString & a_KeyName, const AString & a_ValueName, double const a_Value, const bool a_CreateIfNotExists) +{ + return SetValue(a_KeyName, a_ValueName, Printf("%f", a_Value), a_CreateIfNotExists); +} + + + + + +bool cIniFile::SetValueV(const AString & a_KeyName, const AString & a_ValueName, const char * a_Format, ...) +{ + va_list args; + va_start(args, a_Format); + AString Data; + AppendVPrintf(Data, a_Format, args); + va_end(args); + return SetValue(a_KeyName, a_ValueName, Data); +} + + + + + +AString cIniFile::GetValue(const int keyID, const int valueID, const AString & defValue) const +{ + if ((keyID < (int)keys.size()) && (valueID < (int)keys[keyID].names.size())) + { + return keys[keyID].values[valueID]; + } + return defValue; +} + + + + + +AString cIniFile::GetValue(const AString & keyname, const AString & valuename, const AString & defValue) const +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return defValue; + } + + int valueID = FindValue(int(keyID), valuename); + if (valueID == noID) + { + return defValue; + } + + return keys[keyID].values[valueID]; +} + + + + + +int cIniFile::GetValueI(const AString & keyname, const AString & valuename, const int defValue) const +{ + AString Data; + Printf(Data, "%d", defValue); + return atoi(GetValue(keyname, valuename, Data).c_str()); +} + + + + + +double cIniFile::GetValueF(const AString & keyname, const AString & valuename, double const defValue) const +{ + AString Data; + Printf(Data, "%f", defValue); + return atof(GetValue(keyname, valuename, Data).c_str()); +} + + + + + +AString cIniFile::GetValueSet(const AString & keyname, const AString & valuename, const AString & defValue) +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + SetValue(keyname, valuename, defValue); + return defValue; + } + + int valueID = FindValue(int(keyID), valuename); + if (valueID == noID) + { + SetValue(keyname, valuename, defValue); + return defValue; + } + + return keys[keyID].values[valueID]; +} + + + + + +double cIniFile::GetValueSetF(const AString & keyname, const AString & valuename, const double defValue) +{ + AString Data; + Printf(Data, "%f", defValue); + return atof(GetValueSet(keyname, valuename, Data).c_str()); +} + + + + + +int cIniFile::GetValueSetI(const AString & keyname, const AString & valuename, const int defValue) +{ + AString Data; + Printf(Data, "%d", defValue); + return atoi(GetValueSet(keyname, valuename, Data).c_str()); +} + + + + + +Int64 cIniFile::GetValueSetI(const AString & keyname, const AString & valuename, const Int64 defValue) +{ + AString Data; + Printf(Data, "%lld", defValue); + AString resultstring = GetValueSet(keyname, valuename, Data); + Int64 result = defValue; +#ifdef _WIN32 + sscanf_s(resultstring.c_str(), "%lld", &result); +#else + sscanf(resultstring.c_str(), "%lld", &result); +#endif + return result; +} + + + + + +bool cIniFile::DeleteValueByID(const int keyID, const int valueID) +{ + if ((keyID < (int)keys.size()) && (valueID < (int)keys[keyID].names.size())) + { + // This looks strange, but is neccessary. + vector::iterator npos = keys[keyID].names.begin() + valueID; + vector::iterator vpos = keys[keyID].values.begin() + valueID; + keys[keyID].names.erase(npos, npos + 1); + keys[keyID].values.erase(vpos, vpos + 1); + return true; + } + return false; +} + + + + + +bool cIniFile::DeleteValue(const AString & keyname, const AString & valuename) +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return false; + } + + int valueID = FindValue(int(keyID), valuename); + if (valueID == noID) + { + return false; + } + + return DeleteValueByID(keyID, valueID); +} + + + + + +bool cIniFile::DeleteKey(const AString & keyname) +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return false; + } + + vector::iterator npos = names.begin() + keyID; + vector::iterator kpos = keys.begin() + keyID; + names.erase(npos, npos + 1); + keys.erase(kpos, kpos + 1); + + return true; +} + + + + + +void cIniFile::Clear(void) +{ + names.clear(); + keys.clear(); + comments.clear(); +} + + + + + +bool cIniFile::HasValue(const AString & a_KeyName, const AString & a_ValueName) +{ + // Find the key: + int keyID = FindKey(a_KeyName); + if (keyID == noID) + { + return false; + } + + // Find the value: + int valueID = FindValue(keyID, a_ValueName); + return (valueID != noID); +} + + + + + +void cIniFile::AddHeaderComment(const AString & comment) +{ + comments.push_back(comment); + // comments.resize(comments.size() + 1, comment); +} + + + + + +AString cIniFile::GetHeaderComment(const int commentID) const +{ + if (commentID < (int)comments.size()) + { + return comments[commentID]; + } + return ""; +} + + + + + +bool cIniFile::DeleteHeaderComment(int commentID) +{ + if (commentID < (int)comments.size()) + { + vector::iterator cpos = comments.begin() + commentID; + comments.erase(cpos, cpos + 1); + return true; + } + return false; +} + + + + + +int cIniFile::GetNumKeyComments(const int keyID) const +{ + if (keyID < (int)keys.size()) + { + return (int)keys[keyID].comments.size(); + } + return 0; +} + + + + + +int cIniFile::GetNumKeyComments(const AString & keyname) const +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return 0; + } + return (int)keys[keyID].comments.size(); +} + + + + + +bool cIniFile::AddKeyComment(const int keyID, const AString & comment) +{ + if (keyID < (int)keys.size()) + { + keys[keyID].comments.resize(keys[keyID].comments.size() + 1, comment); + return true; + } + return false; +} + + + + + +bool cIniFile::AddKeyComment(const AString & keyname, const AString & comment) +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return false; + } + return AddKeyComment(keyID, comment); +} + + + + + +AString cIniFile::GetKeyComment(const int keyID, const int commentID) const +{ + if ((keyID < (int)keys.size()) && (commentID < (int)keys[keyID].comments.size())) + { + return keys[keyID].comments[commentID]; + } + return ""; +} + + + + + +AString cIniFile::GetKeyComment(const AString & keyname, const int commentID) const +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return ""; + } + return GetKeyComment(int(keyID), commentID); +} + + + + + +bool cIniFile::DeleteKeyComment(const int keyID, const int commentID) +{ + if ((keyID < (int)keys.size()) && (commentID < (int)keys[keyID].comments.size())) + { + vector::iterator cpos = keys[keyID].comments.begin() + commentID; + keys[keyID].comments.erase(cpos, cpos + 1); + return true; + } + return false; +} + + + + + +bool cIniFile::DeleteKeyComment(const AString & keyname, const int commentID) +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return false; + } + return DeleteKeyComment(int(keyID), commentID); +} + + + + + +bool cIniFile::DeleteKeyComments(const int keyID) +{ + if (keyID < (int)keys.size()) + { + keys[keyID].comments.clear(); + return true; + } + return false; +} + + + + + +bool cIniFile::DeleteKeyComments(const AString & keyname) +{ + int keyID = FindKey(keyname); + if (keyID == noID) + { + return false; + } + return DeleteKeyComments(int(keyID)); +} + + + + + +AString cIniFile::CheckCase(const AString & s) const +{ + if (!m_IsCaseInsensitive) + { + return s; + } + AString res(s); + size_t len = res.length(); + for (size_t i = 0; i < len; i++) + { + res[i] = tolower(res[i]); + } + return res; +} + + + + + +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(ref[i]) != BOM[i]) + { + return; + } + } + + // First three characters match; erase them. + a_line.erase(0, 3); +} + + + + diff --git a/src/IniFile.h b/src/IniFile.h new file mode 100644 index 000000000..33229bff0 --- /dev/null +++ b/src/IniFile.h @@ -0,0 +1,224 @@ +// IniFile.cpp: Implementation of the CIniFile class. +// Written by: Adam Clauss +// Email: cabadam@tamu.edu +// You may use this class/code as you wish in your programs. Feel free to distribute it, and +// email suggested changes to me. +// +// Rewritten by: Shane Hill +// Date: 21/08/2001 +// Email: Shane.Hill@dsto.defence.gov.au +// Reason: Remove dependancy on MFC. Code should compile on any +// platform. Tested on Windows/Linux/Irix +////////////////////////////////////////////////////////////////////// + +/* +!! MODIFIED BY FAKETRUTH and madmaxoft!! +*/ + +#ifndef CIniFile_H +#define CIniFile_H + + + + + +#define MAX_KEYNAME 128 +#define MAX_VALUENAME 128 +#define MAX_VALUEDATA 2048 + + + + + +// tolua_begin + +class cIniFile +{ +private: + bool m_IsCaseInsensitive; + + struct key + { + std::vector names; + std::vector values; + std::vector comments; + } ; + + std::vector keys; + std::vector names; + std::vector comments; + + /// 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 + { + noID = -1, + }; + + /// Creates a new instance with no data + cIniFile(void); + + // Sets whether or not keynames and valuenames should be case sensitive. + // The default is case insensitive. + void CaseSensitive (void) { m_IsCaseInsensitive = false; } + void CaseInsensitive(void) { m_IsCaseInsensitive = true; } + + /** Reads the contents of the specified ini file + If the file doesn't exist and a_AllowExampleRedirect is true, tries to read .example.ini, and + writes its contents as .ini, if successful. + Returns true if successful, false otherwise. + */ + bool ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect = true); + + /// Writes data stored in class to the specified ini file + bool WriteFile(const AString & a_FileName) const; + + /// Deletes all stored ini data (but doesn't touch the file) + void Clear(void); + + /** Returns true iff the specified value exists. */ + bool HasValue(const AString & a_KeyName, const AString & a_ValueName); + + /// Returns index of specified key, or noID if not found + int FindKey(const AString & keyname) const; + + /// Returns index of specified value, in the specified key, or noID if not found + int FindValue(const int keyID, const AString & valuename) const; + + /// Returns number of keys currently in the ini + int GetNumKeys(void) const { return (int)keys.size(); } + + /// Add a key name + int AddKeyName(const AString & keyname); + + // Returns key names by index. + AString GetKeyName(const int keyID) const; + + // Returns number of values stored for specified key. + int GetNumValues(const AString & keyname) const; + int GetNumValues(const int keyID) const; + + // Returns value name by index for a given keyname or keyID. + AString GetValueName(const AString & keyname, const int valueID) const; + AString GetValueName(const int keyID, const int valueID) const; + + // Gets value of [keyname] valuename =. + // Overloaded to return string, int, and double. + // Returns defValue if key/value not found. + AString GetValue (const AString & keyname, const AString & valuename, const AString & defValue = "") const; + AString GetValue (const int keyID, const int valueID, const AString & defValue = "") const; + double GetValueF(const AString & keyname, const AString & valuename, const double defValue = 0) const; + int GetValueI(const AString & keyname, const AString & valuename, const int defValue = 0) const; + bool GetValueB(const AString & keyname, const AString & valuename, const bool defValue = false) const + { + return (GetValueI(keyname, valuename, defValue ? 1 : 0) != 0); + } + + // Gets the value; if not found, write the default to the INI file + AString GetValueSet (const AString & keyname, const AString & valuename, const AString & defValue = ""); + double GetValueSetF(const AString & keyname, const AString & valuename, const double defValue = 0.0); + int GetValueSetI(const AString & keyname, const AString & valuename, const int defValue = 0); + Int64 GetValueSetI(const AString & keyname, const AString & valuename, const Int64 defValue = 0); + bool GetValueSetB(const AString & keyname, const AString & valuename, const bool defValue = false) + { + return (GetValueSetI(keyname, valuename, defValue ? 1 : 0) != 0); + } + + // Adds a new value to the specified key. + // If a value of the same name already exists, creates another one (non-standard INI file) + void AddValue (const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value); + void AddValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value); + void AddValueB(const AString & a_KeyName, const AString & a_ValueName, const bool a_Value) + { + return AddValueI(a_KeyName, a_ValueName, a_Value ? 1 : 0); + } + void AddValueF(const AString & a_KeyName, const AString & a_ValueName, const double a_Value); + + // Overwrites the value of [keyname].valuename + // Specify the optional parameter as false (0) if you do not want the value created if it doesn't exist. + // Returns true if value set, false otherwise. + // Overloaded to accept string, int, and double. + bool SetValue (const int keyID, const int valueID, const AString & value); + bool SetValue (const AString & a_KeyName, const AString & a_ValueName, const AString & a_Value, const bool a_CreateIfNotExists = true); + bool SetValueI(const AString & a_KeyName, const AString & a_ValueName, const int a_Value, const bool a_CreateIfNotExists = true); + bool SetValueI(const AString & a_Keyname, const AString & a_ValueName, const Int64 a_Value, const bool a_CreateIfNotExists = true); + bool SetValueB(const AString & a_KeyName, const AString & a_ValueName, const bool a_Value, const bool a_CreateIfNotExists = true) + { + return SetValueI(a_KeyName, a_ValueName, int(a_Value), a_CreateIfNotExists); + } + bool SetValueF(const AString & a_KeyName, const AString & a_ValueName, const double a_Value, const bool a_CreateIfNotExists = true); + + // tolua_end + + bool SetValueV( const AString & a_KeyName, const AString & a_ValueName, const char * a_Format, ...); + + // tolua_begin + + // Deletes specified value. + // Returns true if value existed and deleted, false otherwise. + bool DeleteValueByID(const int keyID, const int valueID); + bool DeleteValue(const AString & keyname, const AString & valuename); + + // Deletes specified key and all values contained within. + // Returns true if key existed and deleted, false otherwise. + bool DeleteKey(const AString & keyname); + + // Header comment functions. + // Header comments are those comments before the first key. + + /// Returns the number of header comments + int GetNumHeaderComments(void) {return (int)comments.size();} + + /// Adds a header comment + void AddHeaderComment(const AString & comment); + + /// Returns a header comment, or empty string if out of range + AString GetHeaderComment(const int commentID) const; + + /// Deletes a header comment. Returns true if successful + bool DeleteHeaderComment(int commentID); + + /// Deletes all header comments + void DeleteHeaderComments(void) {comments.clear();} + + + // Key comment functions. + // Key comments are those comments within a key. Any comments + // defined within value names will be added to this list. Therefore, + // these comments will be moved to the top of the key definition when + // the CIniFile::WriteFile() is called. + + /// Get number of key comments + int GetNumKeyComments(const int keyID) const; + + /// Get number of key comments + int GetNumKeyComments(const AString & keyname) const; + + /// Add a key comment + bool AddKeyComment(const int keyID, const AString & comment); + + /// Add a key comment + bool AddKeyComment(const AString & keyname, const AString & comment); + + /// Return a key comment + AString GetKeyComment(const int keyID, const int commentID) const; + AString GetKeyComment(const AString & keyname, const int commentID) const; + + // Delete a key comment. + bool DeleteKeyComment(const int keyID, const int commentID); + bool DeleteKeyComment(const AString & keyname, const int commentID); + + // Delete all comments for a key. + bool DeleteKeyComments(const int keyID); + bool DeleteKeyComments(const AString & keyname); +}; + +// tolua_end + +#endif diff --git a/src/MonsterConfig.cpp b/src/MonsterConfig.cpp index a15e413ba..ae2cbbc6b 100644 --- a/src/MonsterConfig.cpp +++ b/src/MonsterConfig.cpp @@ -3,7 +3,7 @@ #include "MonsterConfig.h" #include "Mobs/Monster.h" -#include "inifile/iniFile.h" +#include "IniFile.h" diff --git a/src/Protocol/Authenticator.cpp b/src/Protocol/Authenticator.cpp index 984000795..c9e4296a2 100644 --- a/src/Protocol/Authenticator.cpp +++ b/src/Protocol/Authenticator.cpp @@ -7,7 +7,7 @@ #include "../Server.h" #include "../ClientHandle.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "json/json.h" #include "PolarSSL++/BlockingSslClientSocket.h" diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp index dd0d62af5..67f513e44 100644 --- a/src/Protocol/MojangAPI.cpp +++ b/src/Protocol/MojangAPI.cpp @@ -7,7 +7,7 @@ #include "MojangAPI.h" #include "SQLiteCpp/Database.h" #include "SQLiteCpp/Statement.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" #include "json/json.h" #include "PolarSSL++/BlockingSslClientSocket.h" #include "../RankManager.h" diff --git a/src/RCONServer.cpp b/src/RCONServer.cpp index df027c91f..49ca4fc61 100644 --- a/src/RCONServer.cpp +++ b/src/RCONServer.cpp @@ -4,7 +4,7 @@ // Implements the cRCONServer class representing the RCON server #include "Globals.h" -#include "inifile/iniFile.h" +#include "IniFile.h" #include "RCONServer.h" #include "Server.h" #include "Root.h" diff --git a/src/RankManager.cpp b/src/RankManager.cpp index 3778f5d64..451de88e7 100644 --- a/src/RankManager.cpp +++ b/src/RankManager.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "RankManager.h" -#include "inifile/iniFile.h" +#include "IniFile.h" #include "Protocol/MojangAPI.h" #include "ClientHandle.h" diff --git a/src/Root.cpp b/src/Root.cpp index 6a91ec238..24c1a4cc8 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -19,11 +19,10 @@ #include "OSSupport/Timer.h" #include "LoggerListeners.h" #include "BuildInfo.h" - -#include "inifile/iniFile.h" +#include "IniFile.h" #ifdef _WIN32 - #include "conio.h" + #include #include #elif defined(__linux__) #include diff --git a/src/Server.cpp b/src/Server.cpp index 5085d4c94..bbb5ecff3 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -22,7 +22,7 @@ #include "MersenneTwister.h" -#include "inifile/iniFile.h" +#include "IniFile.h" #include "Vector3.h" #include diff --git a/src/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp index 073518b31..dfbd3e458 100644 --- a/src/Simulator/SandSimulator.cpp +++ b/src/Simulator/SandSimulator.cpp @@ -7,7 +7,7 @@ #include "../Defines.h" #include "../Entities/FallingBlock.h" #include "../Chunk.h" -#include "inifile/iniFile.h" +#include "../IniFile.h" diff --git a/src/WebAdmin.h b/src/WebAdmin.h index 94b95dbcf..a85fb1f0c 100644 --- a/src/WebAdmin.h +++ b/src/WebAdmin.h @@ -7,7 +7,7 @@ #include "OSSupport/Socket.h" #include "Bindings/LuaState.h" -#include "inifile/iniFile.h" +#include "IniFile.h" #include "HTTPServer/HTTPServer.h" #include "HTTPServer/HTTPFormParser.h" diff --git a/src/World.cpp b/src/World.cpp index ff333ad2a..b77b01c10 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -8,7 +8,7 @@ #include "Server.h" #include "Item.h" #include "Root.h" -#include "inifile/iniFile.h" +#include "IniFile.h" #include "ChunkMap.h" #include "Generating/ChunkDesc.h" #include "OSSupport/Timer.h" -- cgit v1.2.3