summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2021-01-12 06:36:43 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2021-01-12 06:36:43 (GMT)
commit3a3e90a04e457a57144c666bc5be23733a7aab39 (patch) (side-by-side diff)
treec479982e9b85464640fe810889961a330780eb86
parent25c2fc05d935da69bf513a795a5a9f175990275f (diff)
downloadmailutils-3a3e90a04e457a57144c666bc5be23733a7aab39.tar.gz
mailutils-3a3e90a04e457a57144c666bc5be23733a7aab39.tar.bz2
Remove left-over mailutils.rc support
* libmailutils/cli/cli.c (MU_LEGACY_CONFIG_FILE): Remove. (mu_cli_ext): No handling for the pre-3.0 configuration file.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libmailutils/cli/cli.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/libmailutils/cli/cli.c b/libmailutils/cli/cli.c
index cad717e..c31df8c 100644
--- a/libmailutils/cli/cli.c
+++ b/libmailutils/cli/cli.c
@@ -35,8 +35,6 @@
#include <mailutils/mu_auth.h>
#include <mailutils/gitinfo.h>
-#define MU_LEGACY_CONFIG_FILE SYSCONFDIR "/mailutils.rc"
-
#ifndef MU_SITE_CONFIG_FILE
# define MU_SITE_CONFIG_FILE SYSCONFDIR "/mailutils.conf"
#endif
@@ -673,29 +671,6 @@ mu_cli_ext (int argc, char **argv,
else if (argc)
mu_parseopt_error (&po, "%s", _("unexpected arguments"));
-#if defined(MU_LEGACY_CONFIG_FILE)
- if ((hints.flags & MU_CFHINT_SITE_FILE)
- && strcmp (hints.site_file, MU_SITE_CONFIG_FILE) == 0)
- {
- if (access (MU_LEGACY_CONFIG_FILE, F_OK) == 0)
- {
- if (access (hints.site_file, F_OK) == 0)
- {
- mu_diag_output (MU_DIAG_WARNING,
- _("legacy configuration file %s ignored"),
- MU_LEGACY_CONFIG_FILE);
- }
- else
- {
- mu_diag_output (MU_DIAG_WARNING,
- _("using legacy configuration file %s: please rename it to %s"),
- MU_LEGACY_CONFIG_FILE, MU_SITE_CONFIG_FILE);
- hints.site_file = MU_LEGACY_CONFIG_FILE;
- }
- }
- }
-#endif
-
if (mu_cfg_parse_config (&parse_tree, &hints))
exit (setup->ex_config);

Return to:

Send suggestions and report system problems to the System administrator.