diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-07 15:47:15 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-07 15:47:15 +0200 |
commit | 4bcd5c9de0cb6ca85bcc3a35b1518739b939b009 (patch) | |
tree | 259f8fe94a7c44b2173d0a15740aa7d585205785 /libmailutils | |
parent | ad938c5af5952cfbe1cb9782999a674eb5ceddbb (diff) | |
download | mailutils-4bcd5c9de0cb6ca85bcc3a35b1518739b939b009.tar.gz mailutils-4bcd5c9de0cb6ca85bcc3a35b1518739b939b009.tar.bz2 |
New global variable mu_site_rcfile keeps the name of the site-wide configuration file.
* include/mailutils/gocs.h (mu_site_rcfile): New extern.
* include/mailutils/libcfg.h (MU_CONFIG_FILE): Remove.
(mu_register_cfg_capa): Remove proto.
(mu_libcfg_register_capa): New proto.
* libmailutils/cfg/gocs.c (mu_site_rcfile): New variable.
* libmu_argp/muinit.c (mu_app_init): Use mu_site_rcfile instead
of MU_CONFIG_FILE.
Destroy parse_tree when no longer needed.
* libmu_cfg/init.c (cfg_capa_table): Static.
(find_cfg_capa): Likewise.
(reserved_name): Treat names starting with dot as reserved.
(mu_libcfg_register_capa): New function.
(mu_libcfg_parse_config): Use mu_site_rcfile instead
of MU_CONFIG_FILE.
* mu/query.c (mutool_query): Use mu_site_rcfile instead
of MU_CONFIG_FILE.
Diffstat (limited to 'libmailutils')
-rw-r--r-- | libmailutils/cfg/gocs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmailutils/cfg/gocs.c b/libmailutils/cfg/gocs.c index 9dd1bab95..ba376b33f 100644 --- a/libmailutils/cfg/gocs.c +++ b/libmailutils/cfg/gocs.c @@ -38,6 +38,11 @@ #include <mailutils/log.h> #include <syslog.h> +#ifndef MU_CONFIG_FILE +# define MU_CONFIG_FILE SYSCONFDIR "/mailutils.rc" +#endif + +char *mu_site_rcfile = MU_CONFIG_FILE; int mu_load_user_rcfile = 1; int mu_load_site_rcfile = 1; char *mu_load_rcfile = NULL; |