Moved all command handler functions into commands.cpp/commands.h

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

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index bb78c2c4b20716f5a22ee246073548aa30a38c6e..c69ba3b176936591e8e4759be85a2a8343bacacb 100644 (file)
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -220,11 +220,97 @@ int EnumConf(std::stringstream *config, const char* tag)
        return idx;
 }
 
+/* Counts the number of values within a certain tag */
+
+int EnumValues(std::stringstream *config, const char* tag, int index)
+{
+       int ptr = 0;
+       char buffer[MAXBUF], c_tag[MAXBUF], c, lastc;
+       int in_token, in_quotes, tptr, j, idx = 0;
+       char* key;
+       
+       bool correct_tag = false;
+       int num_items = 0;
+
+       const char* buf = config->str().c_str();
+       long bptr = 0;
+       long len = strlen(buf);
+       
+       ptr = 0;
+       in_token = 0;
+       in_quotes = 0;
+       lastc = '\0';
+       while (bptr<len)
+       {
+               lastc = c;
+               c = buf[bptr++];
+               if ((c == '#') && (lastc == '\n'))
+               {
+                       while ((c != '\n') && (bptr<len))
+                       {
+                               lastc = c;
+                               c = buf[bptr++];
+                       }
+               }
+               if ((c == '<') && (!in_quotes))
+               {
+                       tptr = 0;
+                       in_token = 1;
+                       do {
+                               c = buf[bptr++];
+                               if (c != ' ')
+                               {
+                                       c_tag[tptr++] = c;
+                                       c_tag[tptr] = '\0';
+                                       
+                                       if ((!strcmp(c_tag,tag)) && (idx == index))
+                                       {
+                                               correct_tag = true;
+                                       }
+                               }
+                       } while (c != ' ');
+               }
+               if (c == '"')
+               {
+                       in_quotes = (!in_quotes);
+               }
+               
+               if ( (correct_tag) && (!in_quotes) && ( (c == ' ') || (c == '\n') || (c == '\r') ) )
+               {
+                       num_items++;
+               }
+               if ((c == '>') && (!in_quotes))
+               {
+                       in_token = 0;
+                       if (correct_tag)
+                               correct_tag = false;
+                       if (!strcmp(c_tag,tag))
+                       {
+                               /* correct tag, but wrong index */
+                               idx++;
+                       }
+                       c_tag[0] = '\0';
+                       buffer[0] = '\0';
+                       ptr = 0;
+                       tptr = 0;
+               }
+               if (c != '>')
+               {
+                       if ((in_token) && (c != '\n') && (c != '\r'))
+                       {
+                               buffer[ptr++] = c;
+                               buffer[ptr] = '\0';
+                       }
+               }
+       }
+       return num_items+1;
+}
+
 
 
 int ConfValueEnum(char* tag, std::stringstream* config)
 {
-       EnumConf(config,tag);
+       return EnumConf(config,tag);
 }
 
 
@@ -292,6 +378,7 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
                                                if (!key)
                                                {
                                                        /* value not found in tag */
+                                                       strcpy(result,"");
                                                        return 0;
                                                }
                                                else
@@ -302,6 +389,7 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
                                                                if (!strlen(key))
                                                                {
                                                                        /* missing quote */
+                                                                       strcpy(result,"");
                                                                        return 0;
                                                                }
                                                                key++;
@@ -339,6 +427,7 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
                        }
                }
        }
+       strcpy(result,""); // value or its tag not found at all
        return 0;
 }
 
@@ -347,6 +436,7 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
 int ConfValue(char* tag, char* var, int index, char *result,std::stringstream *config)
 {
        ReadConf(config, tag, var, index, result);
+       return 0;
 }