Settings: Disallow space characters entirely

Lua API:
> Setting names can't contain whitespace or any of ="{}#

diff --git a/src/settings.cpp b/src/settings.cpp
index 66c17e12d3c4aa8e56175f72a2b363a71be946c9..876c63e7b2c1ea57019a35a6b57f91be73f9463b 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -69,7 +69,9 @@ Settings & Settings::operator = (const Settings &other)
 bool Settings::checkNameValid(const std::string &name)
 {
        bool valid = name.find_first_of("=\"{}#") == std::string::npos;
-       if (valid) valid = trim(name) == name;
+       if (valid)
+               valid = std::find_if(name.begin(), name.end(), ::isspace) == name.end();
+
        if (!valid) {
                errorstream << "Invalid setting name \"" << name << "\""
                        << std::endl;