Implement timers and destination URLs.

* gconf/gconf-gram.y (stmt_end): Make sure end callback is called in the
same environment as the begin one.
* src/vtab.c, src/null.c, src/timer.c: New files.
* src/Makefile.am (wydawca_SOURCES): Add new files.
* src/config.c (cb_mailer): Remove useless check.
(cb_destination_url): New function.
(directory_kw): Change handling of the destination keyword.
(cb_directory): Rewrite final checks.
* src/directive.c, /src/process.c, src/triplet.c: Add timers.
* src/diskio.c (move_file, archive_file, symlink_file, rmsymlink_file): Prefix
with dir_.
* src/mail.c (mail_stats): Add timer meta-variables.
* src/wydawca.c (make_stat_expansion): Change definition.
* src/wydawca.h (struct virt_tab): New data type.
(struct directory_pair.dest_url): New member.
* tests/upload-dry.at: Update expected output.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/mail.c b/src/mail.c
index 37bb493..5449fc8 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -202,10 +202,11 @@ resolve_message_template (const char *name)
 void
 mail_stats ()
 {
-  struct metadef exp[MAX_STAT + 2];
+  struct metadef *exp;
   time_t t;
   const char *tmpl;
   char *text;
+  size_t tc;
 
   if (!admin_stat_message || !stat_mask_p (mail_admin_mask) || !mailer)
     return;
@@ -230,13 +231,13 @@ mail_stats ()
   if (dry_run_mode)
     return;
 
+  tc = timer_get_count () * 3;
+  exp = make_stat_expansion (tc + 1);
   time (&t);
-  memset (exp, 0, sizeof (exp));
   exp[0].kw = "date";
   exp[0].value = exp[0].storage = xstrdup (ctime (&t));
   exp[0].value [strlen (exp[0].value) - 1] = 0;
-
-  make_stat_expansion (exp + 1);
+  timer_fill_meta (exp + 1, tc);
 
   tmpl = resolve_message_template (admin_stat_message);
   if (!tmpl)
@@ -251,6 +252,8 @@ mail_stats ()
 
   free (text);
   meta_free (exp);
+  timer_free_meta (exp + 1, tc);
+  free (exp);
 }
 
 mu_address_t