nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix escaping '"' in config format

Browse Source
This commit is contained in:
John
2021-02-14 11:33:25 +01:00
parent e2f8ae0ecb
commit 02d2845878
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+14 -2
View File
@@ -70,10 +70,22 @@ void AttributedItem::dumpString(bool prependFieldSeparator, const string& str, o
if (prependFieldSeparator) { if (prependFieldSeparator) {
*output << FIELD_SEPARATOR; *output << FIELD_SEPARATOR;
} }
if (str.find_first_of(FIELD_SEPARATOR) == string::npos) { string::size_type pos = str.find_first_of(TEXT_SEPARATOR);
if (str.find_first_of(FIELD_SEPARATOR) == string::npos
&& (pos == string::npos || (pos > 0 && pos < str.length() - 1))) {
*output << str; *output << str;
} else { } else if (pos == string::npos) {
*output << TEXT_SEPARATOR << str << TEXT_SEPARATOR; *output << TEXT_SEPARATOR << str << TEXT_SEPARATOR;
} else {
*output << TEXT_SEPARATOR;
string::size_type last = 0;
while (pos != string::npos) {
*output << str.substr(last, pos - last);
*output << TEXT_SEPARATOR << TEXT_SEPARATOR;
last = pos+1;
pos = str.find_first_of(TEXT_SEPARATOR, last);
}
*output << str.substr(last) << TEXT_SEPARATOR;
} }
} }