--- smsdaemon/common.cpp 2008/06/16 11:57:48 94 +++ smsdaemon/common.cpp 2008/12/07 20:06:12 146 @@ -3,6 +3,7 @@ #include "version.h" +#include #include #include #include @@ -12,9 +13,10 @@ #include "TaskManager.h" #include "PluginManager.h" +#include "ConfigFile.h" using namespace std; -const char* Months[] = { "", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov","Dec"}; +const char* Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov","Dec"}; Common* Common::instance() { @@ -28,6 +30,8 @@ { _pluginManager = new PluginManager(); _taskManager = new TaskManager(); + configFilePath = "/etc/smsdaemon.conf"; + _configFile = new ConfigFile(); } @@ -50,6 +54,11 @@ return _taskManager; } +ConfigFile* Common::GetConfigfile() +{ + return _configFile; +} + void Common::logMessage(string msg) { time_t t = time(0); @@ -84,13 +93,16 @@ void Common::printUsage() { - cout << VERSION << endl << endl; + cout << VERSION << endl; + cout << SVNVERSION << endl << endl; cout << "Usage --daemon|--debug [arguments]" << endl; cout << "Commandline arguments :" << endl; - cout << " --daemon : Run in daemon (background) mode" << endl; - cout << " --debug : Run as normal (frontground) process," << endl; - cout << " with all messages written to std out" << endl; - cout << " --help : Show this help screen" << endl; + cout << " --daemon : Run in daemon (background) mode" << endl; + cout << " --debug : Run as normal (frontground) process," << endl; + cout << " with all messages written to std out" << endl; + cout << " --config : Specify which config file to use " << endl; + cout << " default" << configFilePath << endl; + cout << " --help : Show this help screen" << endl; exit(0); } @@ -114,14 +126,16 @@ isDaemon = false; isDebug = true; } + else if (current == "--config") + { + } else if (current == "-h" || current == "--help") { printUsage(); } else { - cout << VERSION; - cout << "Unknown argument : " << current << endl; + cout << "Unknown argument : " << current << endl << endl; } }