Re: [bug-mailutils] small issues in the argument processing

[Sergey Poznyakoff]

Sergey Poznyakoff <address@hidden> ha escrit:

> I'll probably change this in future.

Patch below:

* libmu_argp/muinit.c (mu_app_init): Allow capa==NULL.
* mailbox/cfg_driver.c (mu_config_clone_container): Do nothing
if cont == NULL.
---
 libmu_argp/muinit.c  |    5 +++--
 mailbox/cfg_driver.c |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libmu_argp/muinit.c b/libmu_argp/muinit.c
index b3f608a..575a329 100644
--- a/libmu_argp/muinit.c
+++ b/libmu_argp/muinit.c
@@ -68,8 +68,9 @@ mu_app_init (struct argp *myargp, const char **capa,
   
   mu_set_program_name (argv[0]);
   mu_libargp_init ();
-  for (i = 0; capa[i]; i++)
-    mu_gocs_register_std (capa[i]); /*FIXME*/
+  if (capa)
+    for (i = 0; capa[i]; i++)
+      mu_gocs_register_std (capa[i]); /*FIXME*/
   if (!myargp)
     myargp = &argpnull;
   argp = mu_argp_build (myargp, &excapa);
diff --git a/mailbox/cfg_driver.c b/mailbox/cfg_driver.c
index e5bdd28..88f1647 100644
--- a/mailbox/cfg_driver.c
+++ b/mailbox/cfg_driver.c
@@ -320,6 +320,8 @@ _clone_action (void *item, void *cbdata)
 int
 mu_config_clone_container (struct mu_cfg_cont *cont)
 {
+  if (!cont)
+    return 0;
   mu_refcount_inc (cont->refcount);
   /* printf("clone %p-%s: %d\n", cont, cont->v.section.ident, n); */
   switch (cont->type)
-- 
1.6.0