Merge branch 'master' of /home/git/rrdd

Signed-off-by: Timo Kokkonen <timo.t.kokkonen@iki.fi>

diff --cc process.c
Simple merge

diff --cc rrdtool.c
index be6232177f909d8217e1f0fef8509b764f80b68b,909e1233ce43becfe2ac8b8ef475ec3ddd086705..c8754176fd66ac6855422356914103e7af6b1b47
--- 1/rrdtool.c
--- 2/rrdtool.c
+++ b/rrdtool.c
@@@ -287,15 -297,14 +287,18 @@@ static int do_rrdtool_update_data(struc
        if (rrd->images)
                rrdtool_draw_images(rrd->images);
  
 -      while (harvest_zombies(0));
++      if (rrd->post_draw_cmd && !strcmp(rrd->post_draw_cmd[0], "shell"))
++              run(rrd->post_draw_cmd[1], &rrd->post_draw_cmd[1]);
+ 
 -      if (rrd->post_draw_cmd && !strcmp(rrd->post_draw_cmd[0], "shell")) {
 -              pid = run(rrd->post_draw_cmd[1], &rrd->post_draw_cmd[1]);
 -              harvest_zombies(pid);
 -      }
 +      return 0;
 +}
  
 -      exit(0);
 +int rrdtool_update_data(struct rrd_database *rrd)
 +{
 +      rrd->last_update = time(0);
 +
 +      return queue_work(WORK_PRIORITY_HIGH, "rrdtool_update_data",
 +                      do_rrdtool_update_data, rrd);
  }
  
  /*