diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-12-28 00:59:50 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-12-28 00:59:50 +0200 |
commit | d39f4c2db3ea8bc387cde7dcc2825598aa166ff6 (patch) | |
tree | 0bec3e016c68147941de2d340f24ffaf718f02f2 /frm/testsuite/frm/test.exp | |
parent | 6dad17fe877fde4f17d87bc5a0327417936dbbd8 (diff) | |
download | mailutils-d39f4c2db3ea8bc387cde7dcc2825598aa166ff6.tar.gz mailutils-d39f4c2db3ea8bc387cde7dcc2825598aa166ff6.tar.bz2 |
Improve configuration parsing (step 1).
Remove obsolete options (these have been made hidden in
v. 2.0). Handle "include" and "program" after parsing
the sources, not while reducing the tree, as was
previously. Retain, however, old functions for compatibility,
making them deprecated. Add "query" mode to mailutils-config.
* include/mailutils/cfg.h (mu_cfg_node_tag): Remove
(mu_cfg_statement): Rename to mu_cfg_node_statement.
(mu_cfg_tree): New member: tail.
(mu_cfg_perror): Change signature.
(mu_cfg_vperror, mu_cfg_parse_error): New protos.
(MU_CFG_PATH_DELIM, MU_CFG_PATH_DELIM_STR): New defines.
(MU_PARSE_CONFIG_PLAIN,MU_CFG_FMT_LOCUS): New constant.
(MU_CFG_DEPRECATED): New macro.
(mu_parse_config,mu_get_config): Deprecated.
(mu_cfg_format_parse_tree): Change signature.
(mu_cfg_format_node, mu_cfg_parse_file): New protos.
(mu_cfg_tree_free): Remove stale proto.
(mu_cfg_find_node, mu_cfg_create_subtree): New protos.
* include/mailutils/libcfg.h (mu_libcfg_parse_config): New proto.
(mu_parse_config_files): Deprecated.
* include/mailutils/mutil.h (mu_make_file_name): New proto.
(mu_retrieve_fp, mu_register_retriever)
(mu_retrieve): Remove unused prototypes.
* include/mailutils/opool.h (mu_opool_union): New proto.
* libmu_argp/Makefile.am (libmu_argp_a_SOURCES): Remove
sources (see below):
* po/POTFILES.in: Likewise.
* libmu_argp/gsasl.c: Remove.
* libmu_argp/pam.c: Remove.
* libmu_argp/radius.c: Remove.
* libmu_argp/sql.c: Remove.
* libmu_argp/tls.c: Remove.
* libmu_argp/virtdomain.c: Remove.
* config/mailutils-config.c: New option --query (-q)
(main): Handle query mode.
* comsat/comsat.c: Define MU_CFG_COMPATIBILITY to suppress
deprecation warnings.
* bootstrap.conf (XGETTEXT_OPTIONS): Add mu_cfg
error reporting functions.
* mailbox/Makefile.am (libmailutils_la_SOURCES): Add
mkfilename.c
* mailbox/mkfilename.c: New file.
* imap4d/imap4d.c: Remove obsolete option (hidden since 2.0)
* libmu_argp/auth.c: Likewise.
* libmu_argp/cmdline.c: Likewise.
* libmu_argp/tls.c: Likewise.
* pop3d/pop3d.c: Likewise.
* libmu_argp/common.c: Likewise.
(mu_common_argp_options): New option --set.
* libmu_argp/muinit.c (mu_app_init): Rewrite using parse
tree as a principal entity.
* libmu_cfg/init.c (mu_libcfg_parse_config): New function.
* mailbox/cfg_driver.c (make_file_name): Remove.
(_cb_include): Use mu_make_file_name.
(mu_build_container): Use deprecated code only unless MU_PARSE_CONFIG_PLAIN
flag is set.
(mu_cfg_tree_reduce): Do nothing if the tree is NULL.
* mailbox/cfg_format.c (format_node): Print locus optionally.
(mu_cfg_format_parse_tree): Take additional argument.
(mu_cfg_format_node): New function.
* mailbox/cfg_lexer.l: Update calls to diagnostic functions.
(mu_cfg_parse_file): New function.
(mu_get_config): Rewrite.
* mailbox/cfg_parser.y (parse_tree): Replace with
parse_head, parse_tail. All usages updated.
(mu_cfg_free_node): New function.
(mu_cfg_vperror): New function.
(mu_cfg_perror,mu_cfg_parse_error): New function.
(mu_cfg_tree_union): New function.
(mu_cfg_tree_postprocess): New function.
(mu_cfg_find_section): Use MU_CFG_PATH_DELIM instead
of hardcoded slash.
(mu_cfg_value_eq): New function.
(mu_cfg_find_node): New function. Redesign of an old idea.
(mu_cfg_create_subtree): New function.
* mailbox/opool.c (mu_opool_union): New function.
* frm/testsuite/frm/test.exp: use --set option instead of
the obsolete --mail-folder.
* messages/testsuite/messages/test.exp: Likewise.
* sieve/testsuite/sieve/action.exp: Likewise.
* mail/testsuite/lib/mail.exp: use --set option instead of
the obsolete --mail-spool.
* mailbox/testsuite/lib/mailbox.exp: Likewise.
* testsuite/lib/mailutils.exp: Likewise.
* mailbox/mutil.c (mu_register_retriever)
(mu_retrieve): Remove unused functions.
Minor fix:
* frm/common.c (frm_abort): Initialize URL
before usage.
(frm_scan): Don't call frm_abort on a mailbox
that was not opened successfully.
Diffstat (limited to 'frm/testsuite/frm/test.exp')
-rw-r--r-- | frm/testsuite/frm/test.exp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/frm/testsuite/frm/test.exp b/frm/testsuite/frm/test.exp index 87a3737ad..72b801542 100644 --- a/frm/testsuite/frm/test.exp +++ b/frm/testsuite/frm/test.exp @@ -1,6 +1,6 @@ # -*- tcl -*- # This file is part of Mailutils testsuite. -# Copyright (C) 2002, 2007 Free Software Foundation +# Copyright (C) 2002, 2007, 2009 Free Software Foundation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -51,7 +51,7 @@ mu_exec -retcode 1 -message "frm -qS" -arg -qS \ mu_exec -retcode 1 -arg -q -message "frm -q" \ "There are messages in that folder." -mu_exec -retcode 1 -arg "--mail-folder=$MU_SPOOL_DIR" -arg +mbox -message "frm +mbox" \ +mu_exec -retcode 1 -arg "--set mailbox.folder=$MU_SPOOL_DIR" -arg +mbox -message "frm +mbox" \ "Sergey Poznyakoff\tMBOX" mu_exec -arg -q -arg %nonexistent -retcode 2 -message "frm -q %nonexistent" \ |