diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-10-19 17:20:42 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-10-19 19:20:31 +0300 |
commit | dc78d43ff77a65e3400af0401142aca2ebb6cd1e (patch) | |
tree | 61b7442d72109e743527a19e5e4ae575a749ed2d /frm | |
parent | d1339b3ffaa3d82e21c3a36e5bdfccee3246904d (diff) | |
download | mailutils-dc78d43ff77a65e3400af0401142aca2ebb6cd1e.tar.gz mailutils-dc78d43ff77a65e3400af0401142aca2ebb6cd1e.tar.bz2 |
Convert remaining utilities (except mh) to mu_cli.
* Makefile.am: Remove libmu_argp and libmu_cfg
* configure.ac: Likewise.
* libmu_argp/: Remove.
* libmu_cfg/: Remove.
* include/mailutils/Makefile.am (pkginclude_HEADERS): Remove gocs.h,
libargp.h, libcfg.h
* frm/frm.c: Register tls auth module
* frm/from.c: Likewise.
* maidag/maidag.c: Likewise.
* mail/mail.c: Likewise.
* messages/messages.c: Likewise.
* movemail/movemail.c: Likewise.
* readmsg/readmsg.c: Likewise.
* sieve/sieve.c: Likewise.
* frm/frm.h: Remove obsolete includes
* imap4d/Makefile.am: Update.
* imap4d/imap4d.c: Use mu_cli for command line and configuration
parsing.
* imap4d/imap4d.h: Update.
* include/mailutils/gocs.h: Remove.
* libmailutils/cfg/gocs.c: Remove.
* libmailutils/cfg/Makefile.am: Remove gocs.c
* include/mailutils/cli.h (mu_cli_capa_apply): Rename to
mu_cli_capa_extend_settings
(mu_cli_setup) <inorder, prog_doc_hook>: New fields.
* include/mailutils/daemon.h: Remove obsolete includes.
* include/mailutils/gsasl.h: Likewise.
* include/mailutils/mailutils.h: Update.
* include/mailutils/mu_auth.h (mu_auth_mode): New enum
(mu_auth_module): Redo structure.
* include/mailutils/opt.h (mu_parseopt) <po_prog_doc_hook>: New field.
* include/mailutils/sql.h (mu_sql_module_config): New extern.
(mu_sql_interface_index): Change proto.
* libmailutils/auth/mu_auth.c: Rewrite.
* libmailutils/auth/system.c (mu_auth_system_module): Update structure
* libmailutils/cli/capa.c (mu_cli_capa_apply): Rename to
mu_cli_capa_extend_settings
* libmailutils/cli/cli.c: Extend settings from auth modules as well.
* libmailutils/opt/help.c (mu_program_help): Invoke po_prog_doc_hook
if defined.
* libmailutils/opt/opt.c (parseopt_init): Check the
MU_PARSEOPT_PROG_DOC_HOOK flag.
(find_long_option): Fix recognition of ambiguous options in case
of exact match.
* libmu_auth/gsasl.c: Add configuration.
* libmu_auth/ldap.c: Likewise.
* libmu_auth/pam.c: Likewise.
* libmu_auth/radius.c: Likewise.
* libmu_auth/sql.c: Likewise.
* libmu_auth/tls.c: Likewise.
* libmu_auth/virtual.c: Likewise.
* mu/Makefile.am: Update.
* mu/mu.c: Rewrite using mu_cli
* mu/mu.h: Likewise.
* mu/acl.c: Likewise.
* mu/cflags.c: Likewise.
* mu/dbm.c: Likewise.
* mu/dispatch.c: Likewise.
* mu/filter.c: Likewise.
* mu/flt2047.c: Likewise.
* mu/getans.c: Likewise.
* mu/getarg.c: Likewise.
* mu/getyn.c: Likewise.
* mu/help.c: Likewise.
* mu/imap.c: Likewise.
* mu/info.c: Likewise.
* mu/ldflags.c: Likewise.
* mu/logger.c: Likewise.
* mu/pop.c: Likewise.
* mu/query.c: Likewise.
* mu/send.c: Likewise.
* mu/shell.c: Likewise.
* mu/smtp.c: Likewise.
* mu/util.c: Likewise.
* mu/verbose.c: Likewise.
* mu/wicket.c: Likewise.
* pop3d/Makefile.am: Update.
* pop3d/pop3d.c: Convert to mu_cli interface.
* pop3d/pop3d.h: Likewise.
* sql/sql.c (mu_sql_interface_index): Change argument qualifiers.
Diffstat (limited to 'frm')
-rw-r--r-- | frm/frm.c | 3 | ||||
-rw-r--r-- | frm/frm.h | 1 | ||||
-rw-r--r-- | frm/from.c | 3 |
3 files changed, 3 insertions, 4 deletions
@@ -181,7 +181,6 @@ static char *frm_argp_capa[] = { "debug", "mailbox", "locking", - "tls", NULL }; @@ -328,7 +327,7 @@ main (int argc, char **argv) /* register the formats. */ mu_register_all_mbox_formats (); - mu_cli_capa_register (&mu_cli_capa_tls); + mu_auth_register_module (&mu_auth_tls_module); mu_cli (argc, argv, &cli, frm_argp_capa, NULL, &argc, &argv); if (align && (s = util_getcols ())) @@ -63,6 +63,7 @@ #include <mailutils/error.h> #include <mailutils/util.h> #include <mailutils/mime.h> +#include <mailutils/mu_auth.h> #include "mailutils/cli.h" diff --git a/frm/from.c b/frm/from.c index 7995bb472..588f76679 100644 --- a/frm/from.c +++ b/frm/from.c @@ -48,7 +48,6 @@ static char *capa[] = { "debug", "mailbox", "locking", - "tls", NULL }; @@ -89,7 +88,7 @@ main (int argc, char **argv) /* register the formats. */ mu_register_all_mbox_formats (); - mu_cli_capa_register (&mu_cli_capa_tls); + mu_auth_register_module (&mu_auth_tls_module); mu_cli (argc, argv, &cli, capa, NULL, &argc, &argv); if (argc > 1) |