aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-04 23:05:44 +0100
committerMax Kellermann <max@duempel.org>2014-12-04 23:05:44 +0100
commit4b70f9d213e8cb71bc225a73494625e31dfaa721 (patch)
tree3f81136416b0b88e917a08e26d32326a839e0efd
parent79d2d1c201babcbbfa1337295d42feebaebb6021 (diff)
downloadmpd-4b70f9d213e8cb71bc225a73494625e31dfaa721.tar.gz
mpd-4b70f9d213e8cb71bc225a73494625e31dfaa721.tar.xz
mpd-4b70f9d213e8cb71bc225a73494625e31dfaa721.zip
util/DivideString: add option "strip"
Diffstat (limited to '')
-rw-r--r--src/output/plugins/AoOutputPlugin.cxx2
-rw-r--r--src/util/DivideString.cxx13
-rw-r--r--src/util/DivideString.hxx6
-rw-r--r--test/DivideStringTest.hxx10
4 files changed, 28 insertions, 3 deletions
diff --git a/src/output/plugins/AoOutputPlugin.cxx b/src/output/plugins/AoOutputPlugin.cxx
index 689e7de7c..4b98f4a77 100644
--- a/src/output/plugins/AoOutputPlugin.cxx
+++ b/src/output/plugins/AoOutputPlugin.cxx
@@ -128,7 +128,7 @@ AoOutput::Configure(const config_param &param, Error &error)
value = param.GetBlockValue("options", nullptr);
if (value != nullptr) {
for (const auto &i : SplitString(value, ';')) {
- const DivideString ss(i.c_str(), '=');
+ const DivideString ss(i.c_str(), '=', true);
if (!ss.IsDefined()) {
error.Format(ao_output_domain,
diff --git a/src/util/DivideString.cxx b/src/util/DivideString.cxx
index d30dfaa16..f781d141f 100644
--- a/src/util/DivideString.cxx
+++ b/src/util/DivideString.cxx
@@ -18,10 +18,11 @@
*/
#include "DivideString.hxx"
+#include "StringUtil.hxx"
#include <string.h>
-DivideString::DivideString(const char *s, char separator)
+DivideString::DivideString(const char *s, char separator, bool strip)
:first(nullptr)
{
const char *x = strchr(s, separator);
@@ -31,6 +32,16 @@ DivideString::DivideString(const char *s, char separator)
size_t length = x - s;
second = x + 1;
+ if (strip)
+ second = StripLeft(second);
+
+ if (strip) {
+ const char *end = s + length;
+ s = StripLeft(s);
+ end = StripRight(s, end);
+ length = end - s;
+ }
+
first = new char[length + 1];
memcpy(first, s, length);
first[length] = 0;
diff --git a/src/util/DivideString.hxx b/src/util/DivideString.hxx
index d8d911691..126aa45d1 100644
--- a/src/util/DivideString.hxx
+++ b/src/util/DivideString.hxx
@@ -33,7 +33,11 @@ class DivideString {
const char *second;
public:
- DivideString(const char *s, char separator);
+ /**
+ * @param strip strip the first part and left-strip the second
+ * part?
+ */
+ DivideString(const char *s, char separator, bool strip=false);
~DivideString() {
delete[] first;
diff --git a/test/DivideStringTest.hxx b/test/DivideStringTest.hxx
index 83c54dc56..f6c01bdde 100644
--- a/test/DivideStringTest.hxx
+++ b/test/DivideStringTest.hxx
@@ -15,6 +15,7 @@ class DivideStringTest : public CppUnit::TestFixture {
CPPUNIT_TEST(TestBasic);
CPPUNIT_TEST(TestEmpty);
CPPUNIT_TEST(TestFail);
+ CPPUNIT_TEST(TestStrip);
CPPUNIT_TEST_SUITE_END();
public:
@@ -41,4 +42,13 @@ public:
const DivideString ds(input, '.');
CPPUNIT_ASSERT(!ds.IsDefined());
}
+
+ void TestStrip() {
+ constexpr char input[] = " foo\t.\nbar\r";
+ const DivideString ds(input, '.', true);
+ CPPUNIT_ASSERT(ds.IsDefined());
+ CPPUNIT_ASSERT(!ds.IsEmpty());
+ CPPUNIT_ASSERT_EQUAL(0, strcmp(ds.GetFirst(), "foo"));
+ CPPUNIT_ASSERT_EQUAL(input + 7, ds.GetSecond());
+ }
};