Fall back to copying bind IP if getsockname() fails, as it apparently can on Windows

[user/henk/code/inspircd.git] / src / configparser.cpp

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 44eb117a84edfa1ff3d16b53feb3ef10612705aa..0e77cbb3679deaf445bf9e4dd2c1fe29745ed8a0 100644 (file)
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,7 +18,7 @@
 struct Parser
 {
        ParseStack& stack;
-       const int flags;
+       int flags;
        FILE* const file;
        fpos current;
        fpos last_tag;
@@ -112,7 +112,7 @@ struct Parser
                while (1)
                {
                        ch = next();
-                       if (ch == '&')
+                       if (ch == '&' && (flags & FLAG_USE_XML))
                        {
                                std::string varname;
                                while (1)
@@ -134,9 +134,20 @@ struct Parser
                                        throw CoreException("Undefined XML entity reference '&" + varname + ";'");
                                value.append(var->second);
                        }
+                       else if (ch == '\\' && !(flags & FLAG_USE_XML))
+                       {
+                               int esc = next();
+                               if (esc == 'n')
+                                       value.push_back('\n');
+                               else if (isalpha(esc))
+                                       throw CoreException("Unknown escape character \\" + std::string(1, esc));
+                               else
+                                       value.push_back(esc);
+                       }
                        else if (ch == '"')
                                break;
-                       value.push_back(ch);
+                       else
+                               value.push_back(ch);
                }
                items->push_back(KeyVal(key, value));
                return true;
@@ -168,12 +179,24 @@ struct Parser
                }
                else if (name == "define")
                {
+                       if (!(flags & FLAG_USE_XML))
+                               throw CoreException("<define> tags may only be used in XML-style config (add <config format=\"xml\">)");
                        std::string varname = tag->getString("name");
                        std::string value = tag->getString("value");
                        if (varname.empty())
                                throw CoreException("Variable definition must include variable name");
                        stack.vars[varname] = value;
                }
+               else if (name == "config")
+               {
+                       std::string format = tag->getString("format");
+                       if (format == "xml")
+                               flags |= FLAG_USE_XML;
+                       else if (format == "compat")
+                               flags &= ~FLAG_USE_XML;
+                       else if (!format.empty())
+                               throw CoreException("Unknown configuration format " + format);
+               }
                else
                {
                        stack.output.insert(std::make_pair(name, tag));