summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2008-11-10 22:04:22 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2008-11-10 22:04:22 +0000
commit7669259c84f2f2255c0a423f779faa4b35737d58 (patch)
tree48cd5a45f4e3d464fa566616a8ce6d277c3c567b
parent8a6fdf20614b9517f81934c80e5bb1b8bcba0ba8 (diff)
downloadmailutils-7669259c84f2f2255c0a423f779faa4b35737d58.tar.gz
mailutils-7669259c84f2f2255c0a423f779faa4b35737d58.tar.bz2
Bugfix.
* libargp/muinit.c (mu_app_init): Do not parse configs if --config-help was given.
-rw-r--r--ChangeLog5
-rw-r--r--libargp/muinit.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f5814087c..823746e1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-11 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * libargp/muinit.c (mu_app_init): Do not parse configs if
+ --config-help was given.
+
2008-11-09 Wojciech Polak <polak@gnu.org>
Fix typos.
diff --git a/libargp/muinit.c b/libargp/muinit.c
index 4e3509fae..ffef76ed0 100644
--- a/libargp/muinit.c
+++ b/libargp/muinit.c
@@ -84,7 +84,6 @@ mu_app_init (struct argp *myargp, const char **capa,
mu_libcfg_init (excapa);
free (excapa);
- mu_parse_config_files (cfg_param, data);
if (mu_help_config_mode)
{
@@ -115,7 +114,9 @@ mu_app_init (struct argp *myargp, const char **capa,
mu_stream_destroy (&stream, NULL);
exit (0);
}
-
+ else
+ mu_parse_config_files (cfg_param, data);
+
if (mu_cfg_parser_verbose)
cfgflags |= MU_PARSE_CONFIG_VERBOSE;
if (mu_cfg_parser_verbose > 1)

Return to:

Send suggestions and report system problems to the System administrator.