fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-23 20:10:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-02-04 Dan Williams <dcbw@redhat.com>

Browse source 
* system-settings/src/main.c
		- (parse_config_file): parse a config file
		- (main): accept --config option and read plugins from config file



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3288 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-02-04 20:03:28 +00:00
parent 58537afe7a
commit 9a92be6c79
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-02-04 Dan Williams <dcbw@redhat.com>
* system-settings/src/main.c
- (parse_config_file): parse a config file
- (main): accept --config option and read plugins from config file
2008-02-04 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/ifcfg-fedora/plugin.c

35
system-settings/src/main.c
View file

@ -375,6 +375,30 @@ error:
return FALSE;
}
static gboolean
parse_config_file (const char *filename, char **plugins, GError **error)
{
GKeyFile *config;
config = g_key_file_new ();
if (!config) {
g_set_error (error, plugins_error_quark (), 0,
"Not enough memory to load config file.");
return FALSE;
}
g_key_file_set_list_separator (config, ',');
if (!g_key_file_load_from_file (config, filename, G_KEY_FILE_NONE, error))
return FALSE;
*plugins = g_key_file_get_value (config, "main", "plugins", error);
if (*error)
return FALSE;
g_key_file_free (config);
return TRUE;
}
int
main (int argc, char **argv)
{
@ -382,8 +406,10 @@ main (int argc, char **argv)
GOptionContext *opt_ctx;
GError *error = NULL;
char *plugins = NULL;
char *config = NULL;
GOptionEntry entries[] = {
{ "config", 0, 0, G_OPTION_ARG_FILENAME, &config, "Config file location", "/path/to/config.file" },
{ "plugins", 0, 0, G_OPTION_ARG_STRING, &plugins, "List of plugins separated by ,", "plugin1,plugin2" },
{ NULL }
};
@ -400,8 +426,15 @@ main (int argc, char **argv)
g_option_context_free (opt_ctx);
if (config) {
if (!parse_config_file (config, &plugins, &error)) {
g_warning ("Invalid config file: %s.", error->message);
return 1;
}
}
if (!plugins) {
g_warning ("'plugins' argument is required.");
g_warning ("No plugins were specified.");
return 1;
}