summaryrefslogtreecommitdiff
path: root/mimeview
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2007-12-03 20:43:04 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2007-12-03 20:43:04 +0000
commitc57171ac85329c8baad86a7e4221ebeef2df0804 (patch)
tree28c9f41649987cd286c76a55bed27aa77f783b97 /mimeview
parent0112e3c07a2b8fcfb642ace4b880575f86fcf933 (diff)
downloadmailutils-c57171ac85329c8baad86a7e4221ebeef2df0804.tar.gz
mailutils-c57171ac85329c8baad86a7e4221ebeef2df0804.tar.bz2
* auth/virtual.c (site_virtual_pwddir): Replace with global
struct mu_gocs_virtual mu_virtual_module_config * include/mailutils/cfg.h (MU_PARSE_CONFIG_GLOBAL) (MU_PARSE_CONFIG_VERBOSE, MU_PARSE_CONFIG_DUMP): New defines. (mu_cfg_tree_create,mu_cfg_tree_set_debug,mu_cfg_tree_set_alloc) (mu_cfg_tree_alloc,mu_cfg_tree_free) (mu_cfg_tree_create_node,mu_cfg_tree_add_node): New functions. * include/mailutils/gocs.h (struct mu_gocs_virtual): New data type. * include/mailutils/libargp.h (struct mu_argp_node_list): New data type. (mu_argp_node_list_init, mu_argp_node_list_add) (mu_argp_node_list_new, mu_argp_node_list_finish): New functions. * libargp/cmdline.h: New header. * libargp/Makefile.am (libmuargp_a_SOURCES): Add cmdline.h. * dotlock/dotlock.c, imap4d/imap4d.c, libargp/auth.c, libargp/cmdline.c, libargp/common.c, libargp/compat.c, libargp/gsasl.c, libargp/mu_argp.c, libargp/muinit.c, libargp/pam.c, libargp/radius.c, libargp/sieve.c, libargp/sql.c, libargp/tls.c, libargp/virtdomain.c, libcfg/common.c, libcfg/init.c, libcfg/virtdomain.c, maidag/maidag.c, mail.local/main.c, mail.remote/mail.remote.c, mimeview/mimeview.c, movemail/movemail.c, pop3d/pop3d.c, readmsg/readmsg.c, sieve/sieve.c: Change option parsing, usig mu_cfg_tree_ functions. * mailbox/argcv.c: Fix a typo in comment. * mailbox/cfg_lexer.c (mu_parse_config_tree): New function. (_mu_parse_config): Rewrite using mu_parse_config_tree. * mailbox/cfg_parser.y (mu_cfg_format_error,_mu_cfg_vperror) (debug_print_node): Use default diag debug_t object, if the passed one is NULL. Reset locus after formatting. (mu_cfg_postorder): Return immediately if node == NULL. (mu_cfg_tree_create,mu_cfg_tree_set_debug,mu_cfg_tree_set_alloc) (mu_cfg_tree_alloc,mu_cfg_tree_free,mu_cfg_tree_create_node) (mu_cfg_tree_add_node): New functions. * mailbox/gocs.c (mu_gocs_store): Make sure no capa/data tuple gets registered twice.
Diffstat (limited to 'mimeview')
-rw-r--r--mimeview/mimeview.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/mimeview/mimeview.c b/mimeview/mimeview.c
index 0fd766bef..7796d3a20 100644
--- a/mimeview/mimeview.c
+++ b/mimeview/mimeview.c
@@ -89,6 +89,8 @@ set_debug_flags (mu_debug_t debug, char *arg)
static error_t
parse_opt (int key, char *arg, struct argp_state *state)
{
+ static struct mu_argp_node_list lst;
+
switch (key)
{
case ARGP_KEY_INIT:
@@ -96,11 +98,13 @@ parse_opt (int key, char *arg, struct argp_state *state)
mimetypes_gram_debug (0);
if (interactive == -1)
interactive = isatty (fileno (stdin));
+ mu_argp_node_list_init (&lst);
break;
case ARGP_KEY_FINI:
if (dry_run && !debug_level)
debug_level = 1;
+ mu_argp_node_list_finish (&lst, NULL, NULL);
break;
case 'a':
@@ -109,9 +113,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
break;
case 'd':
- if (!arg)
- arg = "9";
- set_debug_flags (NULL, arg);
+ mu_argp_node_list_new (&lst, "debug", arg ? arg : "9");
break;
case 'h':
@@ -123,11 +125,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
break;
case 't':
- mimetypes_config = arg;
+ mu_argp_node_list_new (&lst, "mimetypes", arg);
break;
case OPT_METAMAIL:
- metamail = arg ? arg : "metamail";
+ mu_argp_node_list_new (&lst, "metamail", arg ? arg : "metamail");
break;
default:

Return to:

Send suggestions and report system problems to the System administrator.