* include/mailutils/libargp.h (mu_argp_build): Change proto.

* libargp/compat.c (mu_argp_parse): Update call to mu_argp_build.
* libargp/mu_argp.c (mu_argp_build): Optionally return expanded
capability list in the third argument.
* libargp/muinit.c (mu_app_init): Pass expanded capability list to
mu_libcfg_init.

 2007-11-19  Sergey Poznyakoff  <gray@gnu.org.ua>
 2007-11-19  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 
+	* include/mailutils/libargp.h (mu_argp_build): Change proto.
+	* libargp/compat.c (mu_argp_parse): Update call to mu_argp_build.
+	* libargp/mu_argp.c (mu_argp_build): Optionally return expanded
+	capability list in the third argument.
+	* libargp/muinit.c (mu_app_init): Pass expanded capability list to 
+	mu_libcfg_init.
+	
 	* include/mailutils/cfg.h (mu_cfg_parser_verbose): New variable.
 	* include/mailutils/cfg.h (mu_cfg_parser_verbose): New variable.
 	* include/mailutils/libargp.h (OPT_RCFILE_VERBOSE): New value.
 	* include/mailutils/libargp.h (OPT_RCFILE_VERBOSE): New value.
 	* libargp/Makefile.am (AM_CFLAGS): Rename to AM_CPPFLAGS, define
 	* libargp/Makefile.am (AM_CFLAGS): Rename to AM_CPPFLAGS, define

@@ -106,7 +106,7 @@ extern struct mu_cmdline_capa mu_auth_cmdline;
 
 
 extern void mu_libargp_init (void);
 extern void mu_libargp_init (void);
   
   
-extern struct argp *mu_argp_build (const struct argp *argp);
+extern struct argp *mu_argp_build (const struct argp *argp, char ***pcapa);
 extern void mu_argp_done (struct argp *argp);
 extern void mu_argp_done (struct argp *argp);
   
   
 extern int mu_register_argp_capa (const char *name, struct argp_child *child);
 extern int mu_register_argp_capa (const char *name, struct argp_child *child);

@@ -326,7 +326,7 @@ mu_argp_parse (const struct argp *myargp,
   
   
   if (!myargp)
   if (!myargp)
     myargp = &argpnull;
     myargp = &argpnull;
-  argp = mu_argp_build (myargp);
+  argp = mu_argp_build (myargp, NULL);
   rc = argp_parse (argp, *pargc, *pargv, flags, arg_index, input);
   rc = argp_parse (argp, *pargc, *pargv, flags, arg_index, input);
   mu_argp_done (argp);
   mu_argp_done (argp);
   if (rc)
   if (rc)

@@ -196,7 +196,7 @@ argp_reg_action (void *item, void *data)
 }
 }
 
 
 struct argp *
 struct argp *
-mu_argp_build (const struct argp *init_argp)
+mu_argp_build (const struct argp *init_argp, char ***pcapa)
 {
 {
   struct cap_buf cb;
   struct cap_buf cb;
   struct argp *argp;
   struct argp *argp;
@@ -206,6 +206,9 @@ mu_argp_build (const struct argp *init_argp)
   cap_buf_add (&cb, NULL);
   cap_buf_add (&cb, NULL);
   mu_libargp_init ();
   mu_libargp_init ();
   argp = mu_build_argp (init_argp, cb.capa);
   argp = mu_build_argp (init_argp, cb.capa);
+  if (pcapa)
+    *pcapa = cb.capa;
+  else
     cap_buf_free (&cb);
     cap_buf_free (&cb);
   return argp;
   return argp;
 }
 }

@@ -38,6 +38,7 @@ mu_app_init (struct argp *myargp, const char **capa,
   int rc, i;
   int rc, i;
   struct argp *argp;
   struct argp *argp;
   const struct argp argpnull = { 0 };
   const struct argp argpnull = { 0 };
+  char **excapa;
     
     
   mu_set_program_name (argv[0]);
   mu_set_program_name (argv[0]);
   mu_libargp_init ();
   mu_libargp_init ();
@@ -45,13 +46,14 @@ mu_app_init (struct argp *myargp, const char **capa,
     mu_gocs_register_std (capa[i]); /*FIXME*/
     mu_gocs_register_std (capa[i]); /*FIXME*/
   if (!myargp)
   if (!myargp)
     myargp = &argpnull;
     myargp = &argpnull;
-  argp = mu_argp_build (myargp);
+  argp = mu_argp_build (myargp, &excapa);
   rc = argp_parse (argp, argc, argv, flags, pindex, data);
   rc = argp_parse (argp, argc, argv, flags, pindex, data);
   mu_argp_done (argp);
   mu_argp_done (argp);
   if (rc)
   if (rc)
     return rc;
     return rc;
   
   
-  mu_libcfg_init (capa);
+  mu_libcfg_init (excapa);
+  free (excapa);
   mu_parse_config_files (cfg_param);
   mu_parse_config_files (cfg_param);
   
   
   mu_gocs_flush ();
   mu_gocs_flush ();