AstralTransRocketries/LucidCube
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Handle newlines in cIniFile (#5447)

Browse Source 
* Handle newlines during read and write in cIniFile

When reading the ini file, replace \n with newline. When writing,
replace the newline with \n.

* Use ReplaceString instead of regex in IniFile

* Update cIniFile description

* Removed duplicate variable

* Revert "Removed duplicate variable"

This reverts commit de11bac047d871dfbffec28b72f72a2935bd339e.

* Removed duplicate variable

Now without plugin changes

---------

Co-authored-by: x12xx12x <44411062+12xx12@users.noreply.github.com>
This commit is contained in:
Jomar Milan 2023-03-22 03:20:59 -07:00 committed by GitHub
parent c747b4911e
commit fddbf65e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Server/Plugins/APIDump/APIDesc.lua
View File

@ -5375,6 +5375,10 @@ ValueName0=SomeOtherValue
insert values by hand. Then you can store the object's contents to a disk file using WriteFile(), or insert values by hand. Then you can store the object's contents to a disk file using WriteFile(), or
just forget everything by destroying the object. Note that the file operations are quite slow.</p> just forget everything by destroying the object. Note that the file operations are quite slow.</p>
<p> <p>
Cuberite will write the characters '\n' in place of line breaks in the values of the cIniFile when
it is being stored into a file. It will also replace '\n' with line breaks when it reads an INI
file.
<p>
For storing high-volume low-latency data, use the {{sqlite3}} class. For storing For storing high-volume low-latency data, use the {{sqlite3}} class. For storing
hierarchically-structured data, use the XML format, using the LuaExpat parser in the {{lxp}} class. hierarchically-structured data, use the XML format, using the LuaExpat parser in the {{lxp}} class.
]], ]],

6
src/IniFile.cpp
View File

@ -147,6 +147,7 @@ bool cIniFile::ReadFile(const AString & a_FileName, bool a_AllowExampleRedirect)
{ {
valuename = line.substr(0, pLeft); valuename = line.substr(0, pLeft);
value = TrimString(line.substr(pLeft + 1)); value = TrimString(line.substr(pLeft + 1));
ReplaceString(value, "\\n", "\n");
AddValue(keyname, valuename, value); AddValue(keyname, valuename, value);
break; break;
} }
@ -191,6 +192,7 @@ bool cIniFile::WriteFile(const AString & a_FileName) const
// Normally you would use ofstream, but the SGI CC compiler has // Normally you would use ofstream, but the SGI CC compiler has
// a few bugs with ofstream. So ... fstream used. // a few bugs with ofstream. So ... fstream used.
fstream f; fstream f;
AString writevalue;
f.open((a_FileName).c_str(), ios::out); f.open((a_FileName).c_str(), ios::out);
if (f.fail()) if (f.fail())
@ -223,7 +225,9 @@ bool cIniFile::WriteFile(const AString & a_FileName) const
// Values. // Values.
for (size_t valueID = 0; valueID < m_Keys[keyID].m_Names.size(); ++valueID) for (size_t valueID = 0; valueID < m_Keys[keyID].m_Names.size(); ++valueID)
{ {
f << m_Keys[keyID].m_Names[valueID] << '=' << m_Keys[keyID].m_Values[valueID] << iniEOL; writevalue = m_Keys[keyID].m_Values[valueID];
ReplaceString(writevalue, "\n", "\\n");
f << m_Keys[keyID].m_Names[valueID] << '=' << writevalue << iniEOL;
} }
f << iniEOL; f << iniEOL;
} }