Various fixes

* doc/Makefile.am: Improve checking and final rules.
* doc/fdl.texi, doc/rendition.texi: Use single-space sentence separators.
* doc/wydawca.texi: Update.
* src/config.c (cb_email_address): Accept a list of addresses.
* src/meta.c (meta_expand_string): Take two additional arguments. Quote
expansions if they are provided.
* src/triplet.c (triplet_expand_method_query): New function.
* src/mail.c, src/verify.c: Use triplet_expand_method_query
* src/wydawca.h: Update.
* src/meta.c (meta_escape): Remove.

1 files changed, 2 insertions, 6 deletions

diff --git a/src/mail.c b/src/mail.c
index ba77f49..5065306 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -246,13 +246,13 @@ mail_stats ()
   if (!tmpl)
     {
       logmsg (LOG_ERR, _("undefined message reference: %s"),
 	      admin_stat_message);
       return;
     }
-  text = meta_expand_string (tmpl, exp, NULL);
+  text = meta_expand_string (tmpl, exp, NULL, NULL, NULL);
 
   mail_send_message (admin_address, text);
 
   free (text);
   meta_free (exp);
   timer_free_meta (exp + 1, tc);
@@ -261,13 +261,12 @@ mail_stats ()
 
 mu_address_t
 get_recipient (struct access_method *method, struct file_triplet *trp,
 	       char **errp)
 {
   unsigned nrows, ncols, i;
-  struct metadef def[5];
   mu_address_t rcpt = NULL;
   char *text;
   int rc;
   void *md;
 
   if (method->type == method_none)
@@ -280,16 +279,13 @@ get_recipient (struct access_method *method, struct file_triplet *trp,
   if (!md)
     {
       *errp = N_("failed to open access method");
       return NULL;
     }
 
-  make_default_meta (def, trp->user, trp->project);
-  meta_escape (method, md, def);
-  text = meta_expand_string (method->query, def, NULL);
-  meta_free (def);
+  text = triplet_expand_method_query (method, md, trp);
 
   rc = method_run (method, md, text);
   free (text);
   if (rc)
     {
       *errp = N_("cannot obtain recipient emails");