Start transition to mu_cli interface

* configure.ac: Require mailutils 2.99.991

* src/main.c: Start transition to mu_cli
* lib/optcache.c: Remove file.
* lib/Makefile.am (optcache.c): Remove.
* lib/libmf.h: Remove optcache prototypes.
* lib/dbcfg.c: Convert to mu_option.
* lib/utils.c: Likewise.
* src/builtin/dns.bi: Likewise.
* src/builtin/io.bi: Likewise.
* src/builtin/mbox.bi: Likewise.
* src/builtin/msg.bi: Likewise.
* src/mfdbtool.c: Likewise.
* src/savsrv.c: Likewise.
* src/srvcfg.c: Likewise.
* src/srvcfg.h: Likewise.

1 files changed, 343 insertions, 380 deletions

diff --git a/src/main.c b/src/main.c
index 255500a9..3c4b8462 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,7 +35,7 @@
 #include <mailutils/mailutils.h>
 #include <mailutils/server.h>
 #include <mailutils/syslog.h>
-#include <mailutils/libargp.h>
+#include <mailutils/cli.h>
 #include <mailutils/dbm.h>
 
 #include "mailfromd.h"
@@ -80,6 +80,10 @@ char *callout_server_url;
 
 mu_stream_t mf_strecho; /* Output stream for 'echo' statements */
 
+#define ARG_UNSET (-1)
+
+static int trace_option = ARG_UNSET;
+static mu_list_t trace_modules;
 
 /* Preprocessor helper function */
 static void
@@ -255,17 +259,8 @@ host_in_relayed_domain_p(char *client)
         free(hbuf);
         return rc;
 }
-
 
-static void     
-set_milter_timeout(union mf_option_value *val)
-{
-        if (smfi_settimeout(val->ov_time) == MI_FAILURE) {
-                mu_error(_("invalid milter timeout: %lu"),
-                         (unsigned long)val->ov_time);
-                exit(EX_USAGE);
-        }
-}
+static mu_list_t relayed_domain_files;
 
 static int
 load_relay_file(void *item, void *data)
@@ -275,427 +270,389 @@ load_relay_file(void *item, void *data)
 }
 
 static void
-set_relay(union mf_option_value *val)
+init_relayed_domains(void)
 {
-        mu_list_foreach(val->ov_list, load_relay_file, NULL);
-        mu_list_destroy(&val->ov_list);
+        mu_list_foreach(relayed_domain_files, load_relay_file, NULL);
+        mu_list_destroy(relayed_domain_files);
 }
+
+/* Command line parsing */
 
-void
-set_stack_trace(union mf_option_value *val)
+const char *program_version = "mailfromd (" PACKAGE_STRING ")";
+static char prog_doc[] = N_("mailfromd -- a general purpose milter daemon");
+static char args_doc[] = "[var=value...][SCRIPT]";
+
+static void
+opt_testmode(struct mu_parseopt *po, struct mu_option *op, char const *arg)
 {
-        stack_trace_option = val->ov_bool;
+        mode = MAILFROMD_TEST;
+        if (arg) {
+                test_state =  string_to_state(arg);
+                if (test_state == smtp_state_none) {
+                        mu_parseopt_error(op,
+                                          _("unknown smtp state tag: %s"),
+                                          arg);
+                        exit(po->po_exit_error);
+                }
+                log_stream = "stderr";
+                need_script = 1;
+        }
 }
 
-static int
-option_relay(char const *opt, union mf_option_value *val, char const *newval)
+static void
+opt_runmode(struct mu_parseopt *po, struct mu_option *op, char const *arg)
 {
-        if (!val->ov_list) 
-                mu_list_create(&val->ov_list);
-        mu_list_append(val->ov_list, strdup(newval));
-        return 0;
+        mode = MAILFROMD_RUN;
+        if (arg)
+                main_function_name = arg;
+        log_stream = "stderr";
+        need_script = 1;
 }
 
-struct mf_option_cache option_cache[] = {
-        { "stack-trace", mf_option_boolean, set_stack_trace },
-        { "milter-timeout", mf_option_timeout, set_milter_timeout },
-        { "relay", option_relay, set_relay },
-        { NULL }
-};
-
-
-/* Command line parsing */
-
-const char *program_version = "mailfromd (" PACKAGE_STRING ")";
-static char doc[] = N_("mailfromd -- a general purpose milter daemon");
-static char args_doc[] = "[var=value...][SCRIPT]";
+static void
+opt_lint(struct mu_parseopt *po, struct mu_option *op, char const *arg)
+{
+        log_stream = "stderr";
+        script_check = 1;
+        need_script = 1;
+}
 
-enum mailfromd_option {
-        OPTION_DAEMON = 256,
-        OPTION_DOMAIN_FILE,
-        OPTION_DUMP_CODE,
-        OPTION_DUMP_GRAMMAR_TRACE,
-        OPTION_DUMP_LEX_TRACE,
-        OPTION_DUMP_MACROS,
-        OPTION_DUMP_TREE,
-        OPTION_DUMP_XREF,
-        OPTION_LOCATION_COLUMN,
-        OPTION_GACOPYZ_LOG,
-        OPTION_LINT,
-        OPTION_MILTER_TIMEOUT,
-        OPTION_MTASIM,
-        OPTION_NO_PREPROCESSOR,
-        OPTION_PREPROCESSOR,
-        OPTION_RUN,
-        OPTION_SHOW_DEFAULTS,
-        OPTION_STACK_TRACE,
-        OPTION_TIMEOUT,
-        OPTION_TRACE,
-        OPTION_TRACE_PROGRAM,
-};
+static void
+opt_show_defaults(struct mu_parseopt *po, struct mu_option *op,
+                  char const *arg)
+{
+        mode = MAILFROMD_SHOW_DEFAULTS;
+        need_script = 0;
+}
 
-static struct argp_option options[] = {
-#define GRP 0
-        { NULL, 0, NULL, 0,
-          N_("Operation modifiers"), GRP },
-        { "test", 't', N_("HANDLER"), OPTION_ARG_OPTIONAL,
-          N_("run in test mode"), GRP+1 },
-        { "run", OPTION_RUN, N_("FUNC"), OPTION_ARG_OPTIONAL,
-          N_("run script and execute function FUNC (\"main\" if not given)"),
-          GRP+1 },
-        { "lint", OPTION_LINT, NULL, 0,
-          N_("check syntax and exit"), GRP+1 },
-        { "syntax-check", 0, NULL, OPTION_ALIAS, NULL, GRP+1 },
-        { "show-defaults", OPTION_SHOW_DEFAULTS, NULL, 0,
-          N_("show compilation defaults"), GRP+1 },
-        { "daemon", OPTION_DAEMON, NULL, 0,
-          N_("run in daemon mode (default)"), GRP+1 },
-
-        { NULL, 'E', NULL, 0,
-          N_("preprocess source files and exit"), GRP+1 },
-        /* Reserved for future use: */
-        { "compile", 'c', NULL, OPTION_HIDDEN,
-          N_("compile files"), GRP+1 },
-        { "load", 'l', N_("FILE"), OPTION_HIDDEN, 
-          N_("load library"), GRP+1 },
-        { "load-dir", 'L', N_("DIR"), OPTION_HIDDEN,
-          N_("add DIR to the load path"), GRP+1 },
-                
-#undef GRP      
-#define GRP 20
-        { NULL, 0, NULL, 0,
-          N_("General options"), GRP },
-        { "include", 'I', N_("DIR"), 0,
-          N_("add the directory DIR to the list of directories to be "
-             "searched for header files"), GRP+1 },
-        { "port", 'p', N_("STRING"), 0,
-          N_("set communication socket"), GRP+1 },
-        { "mtasim", OPTION_MTASIM, NULL, 0,
-          N_("run in mtasim compatibility mode"), GRP+1 },
-        { "optimize", 'O', N_("LEVEL"), OPTION_ARG_OPTIONAL,
-          N_("set code optimization level"), GRP+1 },
-        { "variable", 'v', N_("VAR=VALUE"), 0,
-          N_("assign VALUE to VAR"), GRP+1 },
-        { "relayed-domain-file", OPTION_DOMAIN_FILE, N_("FILE"), 0,
-          N_("read relayed domains from FILE"), GRP+1 },
-
-#undef GRP
-#define GRP 25
-        { NULL, 0, NULL, 0,
-          N_("Preprocessor options"), GRP },
-        { "preprocessor", OPTION_PREPROCESSOR, N_("COMMAND"), 0,
-          N_("use command as external preprocessor"), GRP+1 },
-        { "no-preprocessor", OPTION_NO_PREPROCESSOR, NULL, 0,
-          N_("disable the use of external preprocessor"), GRP+1 },
-        { "define", 'D', N_("NAME[=VALUE]"), 0,
-          N_("define a preprocessor symbol NAME as having VALUE, or empty"),
-          GRP+1 },
-        { "undefine", 'U', N_("NAME"), 0,
-          N_("undefine a preprocessor symbol NAME"),
-          GRP+1 },
-
-#undef GRP
-#define GRP 30
-        { NULL, 0, NULL, 0,
-          N_("Timeout control"), GRP },
-        { "milter-timeout", OPTION_MILTER_TIMEOUT, N_("TIME"), 0,
-          N_("set MTA connection timeout"), GRP+1 },
-        { "timeout", OPTION_TIMEOUT, N_("TIME"), 0,
-          N_("set I/O operation timeout"), GRP+1 },
-        
-#undef GRP
-#define GRP 40
+static void
+opt_daemon(struct mu_parseopt *po, struct mu_option *op,
+           char const *arg)
+{
+        mode = MAILFROMD_DAEMON;
+        need_script = 1;
+}