gergely/wxmppd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Command line option parsing, configuration parsing

Browse Source 
Made config file parsing a bit more fool proof
Config file can now contain a modules-dir element that holds the location of the DSO's
Prepared module loading function to be able to dry-run
Removed some unneeded header files
Added command line options parsing
This commit is contained in:
Gergely Polonkai (W00d5t0ck)
2011-01-25 17:37:55 +01:00
parent 5cc379461a
commit 5c26ca28a6
5 changed files with 117 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/wxmppd.c
View File

@@ -1,24 +1,67 @@
#define CONFIG_DIR "/home/polesz/Projektek/wxmppd/data"
#include <stdio.h>
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
#include <glib.h>
#include <libxml/parser.h>
#include "configfiles.h"
char *config_dir = NULL;
gchar *config_dir = NULL;
gchar *cl_modules_dir = NULL;
gchar *cl_keys_file = NULL;
static GOptionEntry optionEntries[] = {
{ "config-dir", 'c', 0, G_OPTION_ARG_FILENAME, &config_dir, "Directory where configuration files can be found", "DIRECTORY" },
{ "module-dir", 'm', 0, G_OPTION_ARG_FILENAME, &cl_modules_dir, "Directory of the module files", "DIRECTORY" },
{ "keys-file", 'k', 0, G_OPTION_ARG_FILENAME, &cl_keys_file, "Path to key store file", "FILE" },
{ NULL },
};
int
main(int argc, char **argv)
{
GError *err;
GOptionContext *optContext;
gchar *configFile;
wxmppd_config_t *configObject;
optContext = g_option_context_new("- XMPP daemon");
g_option_context_add_main_entries(optContext, optionEntries, NULL);
if (!g_option_context_parse(optContext, &argc, &argv, &err))
{
g_print("Option parsing failed (%s)!\n", err->message);
return 1;
}
if (config_dir == NULL)
{
config_dir = g_strdup_printf("%s/wxmppd", SYSCONFDIR);
}
configFile = g_strdup_printf("%s/wxmppd.xml", config_dir);
xmlInitParser();
LIBXML_TEST_VERSION;
printf("%s\n", SYSCONFDIR);
if (wxmppd_processConfigfile(configFile, 1, &configObject) != WXMPPD_CONFIG_SUCCESS)
{
return 1;
}
wxmppd_processConfigfile(CONFIG_DIR "/wxmppd.xml", 1);
if (cl_modules_dir != NULL)
{
if (configObject->modules_dir != NULL)
{
g_free(configObject->modules_dir);
}
configObject->modules_dir = g_strdup(cl_modules_dir);
}
if (configObject->modules_dir == NULL)
{
configObject->modules_dir = g_strdup_printf("%s/wxmppd", LIBDIR);
}
printf("%s\n", configObject->modules_dir);
xmlCleanupParser();