diff options
Diffstat (limited to 'yhttpd/src/conf')
| -rw-r--r-- | yhttpd/src/conf/conf.cpp | 186 | ||||
| -rw-r--r-- | yhttpd/src/conf/conf.h | 29 |
2 files changed, 0 insertions, 215 deletions
diff --git a/yhttpd/src/conf/conf.cpp b/yhttpd/src/conf/conf.cpp deleted file mode 100644 index 25884ca..0000000 --- a/yhttpd/src/conf/conf.cpp +++ /dev/null @@ -1,186 +0,0 @@ -#ifndef CONF_CPP -#define CONF_CPP - -#include <fstream> -#include "conf.h" - -using namespace std; - -conf::conf( string s_conf, map<string,string>* p_main_loop_params ) : name::name( s_conf ) -{ - string s_check[] = { - get_name(), - string(getenv("HOME"))+string("/.yhttpd/") + get_name(), - string("./etc/") + get_name(), - string("/etc/") + get_name(), - string(PREFIX+string("etc/")+get_name()) }; - - string s_config; - - for ( int i = 0; i < 4; ++i ) - { - cout << "Checking for " << s_check[i]; - ifstream if_check( s_check[i].c_str() ); - if( if_check ) - { - s_config = s_check[i]; - if_check.close(); - cout << "... ok!" << endl; - break; - } - cout << "... not ok!" << endl; - } - - if ( s_config.empty() ) - { - cout << CFILEFA << endl; - exit(1); - } - - else - { - cout << CFILEOK << "..." << endl; - } - - p_xml = new TiXmlDocument(s_config.c_str()); - TiXmlBase::SetCondenseWhiteSpace( false ); - - if ( !p_xml->LoadFile() ) - { - cout << XMLER1 << endl; - exit(1); - } - - vector<string> vec_string; - parse_xml(p_xml, &vec_string); - - shashmap<string>::add_elem_insecure(tool::yhttpd_version(), "yhttpd.version"); - - // Overrides yhttpd.conf values with command line options (yhttpd -o key1 value1 -o key2 value2 ...) - map<string,string>::iterator iter; - for ( iter = p_main_loop_params->begin(); iter != p_main_loop_params->end(); iter++ ) - { - shashmap<string>::del_elem_insecure(iter->first); - shashmap<string>::add_elem_insecure(iter->second, iter->first); - } - - delete p_xml; -} - -void -conf::parse_xml(TiXmlNode* p_node, vector<string>* p_vec) -{ - if ( p_node->NoChildren() ) - return; - - for ( TiXmlNode* p_child = p_node->FirstChild(); p_child; p_child = p_child->NextSibling() ) - { - //cout << p_vec->size() << ": (Value:" << p_child->Value() << ") (Type:" << p_child->Type() << ")" << endl; - - if ( strcmp(p_child->Value(),"config") == 0 ) - { - parse_xml(p_child, p_vec); - } - - else if ( strcmp(p_child->Value(),"category") == 0 ) - { - p_vec->push_back(p_child->ToElement()->Attribute("name")); - parse_xml(p_child, p_vec); - p_vec->pop_back(); - } - - else if ( strcmp(p_child->Value(),"option") == 0 ) - { - string s_option_name = ""; - - for ( vector<string>::iterator iter = p_vec-> - begin(); - iter != p_vec->end(); - ++iter ) - s_option_name.append(*iter + "."); - - TiXmlElement* p_element = p_child->ToElement(); - exit_if_xml_error(); - - s_option_name.append(p_element->Attribute("name")); - -#ifdef VERBOSE - cout << XMLREAD << s_option_name; -#endif - - TiXmlNode *p_node_value = p_element->FirstChild("value"); - TiXmlNode *p_node_descr = p_element->FirstChild("descr"); - - TiXmlText* p_text_value = NULL; - TiXmlText* p_text_descr = NULL; - - if ( p_node_value && p_node_value->FirstChild() - ) - p_text_value = p_node_value->FirstChild()->ToText(); - - if ( p_node_descr && p_node_descr->FirstChild() - ) - p_text_descr = p_node_descr->FirstChild()->ToText(); - - if ( !p_text_value ) - continue; - -#ifdef VERBOSE - cout << " := " << p_text_value->Value() << endl; -#endif - - shashmap<string>::add_elem_insecure(p_text_value->Value(), s_option_name); - - if ( !p_text_descr ) - continue; - - s_option_name.append(".descr"); -#ifdef VERBOSE - cout << XMLREAD << s_option_name << endl; -#endif - shashmap<string>::add_elem_insecure(p_text_descr->Value(), s_option_name); - } - } - - exit_if_xml_error() - ; -} - -conf::~conf() -{ - delete p_xml; -} - -void -conf::exit_if_xml_error() const -{ - if ( p_xml->Error() ) - { - cout << XMLERR << p_xml->ErrorDesc() << endl; - exit(1); - } -} - - -int -conf::get_int(string s_key) -{ - return tool::string2int(get_elem(s_key)); -} - -vector<string> -conf::get_vector(string s_key) -{ - vector<string> vec_ret; - string s_val = get_elem(s_key); - - for (unsigned i_pos = s_val.find(" "); i_pos != string::npos; i_pos = s_val.find(" ")) - { - vec_ret.push_back(s_val.substr(0, i_pos)); - s_val = s_val.substr(i_pos+1); - } - - vec_ret.push_back(s_val); - return vec_ret; -} -#endif diff --git a/yhttpd/src/conf/conf.h b/yhttpd/src/conf/conf.h deleted file mode 100644 index b083d8c..0000000 --- a/yhttpd/src/conf/conf.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef CONF_H -#define CONF_H - -class conf; // Predefine for nmap.tmpl - -#include <map> -#include "../incl.h" -#include "../maps/shashmap.h" -#include "../name.h" -#include "../contrib/xml/tinyxml.h" - -using namespace std; - -class conf : public shashmap<string>, name -{ -private: - TiXmlDocument* p_xml; - void exit_if_xml_error() const; - void parse_xml( TiXmlNode* p_node, vector<string>* p_vec); - -public: - conf(string s_conf, map<string,string>* p_main_loop_params); - ~conf(); - - int get_int(string s_key); - vector<string> get_vector(string s_key); -}; - -#endif |