summaryrefslogtreecommitdiff
path: root/comsat/comsat.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2016-11-02 12:06:08 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2016-11-02 12:06:08 +0200
commitdc62b3998f0fe8ce0f131e269b130831093264fb (patch)
treea6b27a403088ab5252388c5891e5fd3ef1fcc9f4 /comsat/comsat.c
parentb4c787e6ea89ba0005845925cc33070a264d2a77 (diff)
downloadmailutils-dc62b3998f0fe8ce0f131e269b130831093264fb.tar.gz
mailutils-dc62b3998f0fe8ce0f131e269b130831093264fb.tar.bz2
Improve configuration file handling.
* include/mailutils/cfg.h (mu_cfg_parse_hints): Rename site_rcfile to site_file, custom_rcfile to custom_file. Remove append_tree and data fields. (MU_PARSE_CONFIG_GLOBAL,MU_CFG_PARSE_PROGRAM): Remove. (MU_PARSE_CONFIG_VERBOSE): Rename to MU_CF_VERBOSE. (MU_PARSE_CONFIG_DUMP): Rename to MU_CF_DUMP. (MU_CFG_FMT_LOCUS): Rename to MU_CF_FMT_LOCUS. (MU_CFG_FMT_VALUE_ONLY): Rename to MU_CF_FMT_VALUE_ONLY. (MU_CFG_FMT_PARAM_PATH): Rename to MU_CF_FMT_PARAM_PATH. (MU_CFG_COMPATIBILITY,MU_CFG_DEPRECATED): Remove. (mu_parse_config, mu_get_config): Remove deprecated functions. * libmailutils/cli/cli.c (mu_general_help_text): New global. (app_data): New struct. (init_options): Construct configuration option group depending on which configuration files are in use. (mu_cli_ext): Don't use per-user configuration files for servers. Pass pointer to app_data structure as po.po_data (mu_cli): Set MU_CFHINT_PER_USER_FILE flag by default. * mail/testsuite/lib/mail.exp: Rewrite invocation of the mu_init command. * include/mailutils/cli.h (mu_cli_setup) <server>: New field. * comsat/comsat.c (cli): Mark as server. (main): Bugfix: pass pointer to server to mu_cli. * imap4d/imap4d.c (cli): Mark as server. * pop3d/pop3d.c: Likewise. * comsat/tests/testsuite.at: Use the --no-site-config option. * imap4d/tests/testsuite.at: Likewise. * libmailutils/cfg/driver.c: Update. * libmailutils/cfg/format.c: Update. * libmailutils/cfg/lexer.l: Update. * libmailutils/cfg/parser.y: Update. * mu/acl.c: Update. * pop3d/testsuite/lib/pop3d.exp: Likewise. * mu/mu.c: Don't read configuration files. * mu/query.c: Fix args_doc * testsuite/lib/mailutils.exp (mu_init): Change option handling. Set --no-config option by default.
Diffstat (limited to 'comsat/comsat.c')
-rw-r--r--comsat/comsat.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/comsat/comsat.c b/comsat/comsat.c
index e16f91a23..2a6d69fca 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -194,11 +194,11 @@ struct mu_cfg_param comsat_cfg_param[] = {
static char const *alt_args[] = { N_("--test MBOX-URL MSG-QID"), NULL };
static struct mu_cli_setup cli = {
- options,
- comsat_cfg_param,
- N_("GNU comsatd -- notify users about incoming mail"),
- "",
- alt_args,
+ .optv = options,
+ .cfg =comsat_cfg_param,
+ .prog_doc = N_("GNU comsatd -- notify users about incoming mail"),
+ .prog_alt_args = alt_args,
+ .server = 1
};
static char *capa[] = {
@@ -568,7 +568,7 @@ main (int argc, char **argv)
save_argv = argv;
- mu_cli (argc, argv, &cli, capa, NULL, &argc, &argv);
+ mu_cli (argc, argv, &cli, capa, server, &argc, &argv);
if (test_mode)
{

Return to:

Send suggestions and report system problems to the System administrator.