summaryrefslogtreecommitdiff
path: root/src/zyklonb.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/zyklonb.c')
-rw-r--r--src/zyklonb.c33
1 files changed, 21 insertions, 12 deletions
diff --git a/src/zyklonb.c b/src/zyklonb.c
index 3d8d388..1c7f6ae 100644
--- a/src/zyklonb.c
+++ b/src/zyklonb.c
@@ -1686,6 +1686,25 @@ print_usage (const char *program_name)
program_name);
}
+static void
+call_write_default_config (const char *hint)
+{
+ static const char *prolog =
+ "# " PROGRAM_NAME " " PROGRAM_VERSION " configuration file\n"
+ "\n";
+
+ struct error *e = NULL;
+ char *filename = write_default_config (hint, prolog, g_config_table, &e);
+ if (!filename)
+ {
+ print_fatal ("%s", e->message);
+ error_free (e);
+ exit (EXIT_FAILURE);
+ }
+ print_status ("configuration written to `%s'", filename);
+ free (filename);
+}
+
int
main (int argc, char *argv[])
{
@@ -1693,7 +1712,6 @@ main (int argc, char *argv[])
str_vector_init (&g_original_argv);
str_vector_add_vector (&g_original_argv, argv);
- struct error *e = NULL;
static struct option opts[] =
{
{ "debug", no_argument, NULL, 'd' },
@@ -1723,18 +1741,8 @@ main (int argc, char *argv[])
printf (PROGRAM_NAME " " PROGRAM_VERSION "\n");
exit (EXIT_SUCCESS);
case 'w':
- {
- char *filename = write_default_config (optarg, g_config_table, &e);
- if (!filename)
- {
- print_fatal ("%s", e->message);
- error_free (e);
- exit (EXIT_FAILURE);
- }
- print_status ("configuration written to `%s'", filename);
- free (filename);
+ call_write_default_config (optarg);
exit (EXIT_SUCCESS);
- }
default:
print_fatal ("error in options");
exit (EXIT_FAILURE);
@@ -1753,6 +1761,7 @@ main (int argc, char *argv[])
struct bot_context ctx;
bot_context_init (&ctx);
+ struct error *e = NULL;
if (!read_config_file (&ctx.config, &e))
{
print_fatal ("error loading configuration: %s", e->message);