Merge branch 'refs/heads/t/multiple-source-dirs'

Was cooking for more than a year.

* refs/heads/t/multiple-source-dirs:
  create_rsync_argv(): Allocate correctly sized arg array.
  Support multiple source directories.

diff --git a/dss.c b/dss.c
index b6a3d3e714059861ab1ae100933655b7e4e13c50..a219cfd37b4569fbc3aa67fb2d4443a950353197 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -81,7 +81,7 @@ static int64_t next_snapshot_time;
 static struct timeval next_removal_check;
 /** Creation time of the snapshot currently being created. */
 static int64_t current_snapshot_creation_time;
-/** The snapshot currently being removed. */
+/* Set by the pre-rm hook, cleared by handle_remove_exit(). */
 struct snapshot *snapshot_currently_being_removed;
 /** Needed by the post-create hook. */
 static char *path_to_last_complete_snapshot;
@@ -574,9 +574,6 @@ static int is_reference_snapshot(struct snapshot *s)
        return strcmp(s->name, name_of_reference_snapshot)? 0 : 1;
 }
 
-/*
- * return: 0: no redundant snapshots, 1: rm process started, negative: error
- */
 static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl)
 {
        int i, interval;

diff --git a/index.html.in b/index.html.in
index a65fe010ec7fa83acc81d4455620f8e0c32be360..42606cabd91b2e80a41a3c959ac4b683a53f5753 100644 (file)
--- a/index.html.in
+++ b/index.html.in
@@ -114,9 +114,13 @@
                </h2>
        </center>
 
-       <p> Andr&eacute; Noll, <a
-       href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>
-       </p> Comments and bug reports are welcome. Please provide
+       <p> Email: Andr&eacute; Noll, <a
+       href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>,
+       Homepage: <a
+       href="http://people.tuebingen.mpg.de/maan/">http://people.tuebingen.mpg.de/maan/</a>
+       </p>
+
+       Comments and bug reports are welcome. Please provide
        enough info such as the version of dss you are using and
        relevant parts of the logs. Including the string [dss] in
        the subject line is also a good idea.