Support multiple source directories.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index a782a2e26b5562c0293e5b38d425be480610ba04..f8bbb99a987b51943a4699af51b69480bc0b92aa 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -158,7 +158,7 @@ static void dump_dss_config(const char *msg)
        fprintf(log, "\n*** internal state ***\n\n");
        fprintf(log,
                "pid: %d\n"
-               "logile: %s\n"
+               "logfile: %s\n"
                "snapshot_currently_being_removed: %s\n"
                "path_to_last_complete_snapshot: %s\n"
                "reference_snapshot: %s\n"
@@ -413,7 +413,8 @@ static void dss_get_snapshot_list(struct snapshot_list *sl)
 static int64_t compute_next_snapshot_time(void)
 {
        int64_t x = 0, now = get_current_time(), unit_interval
-               = 24 * 3600 * OPT_UINT32_VAL(DSS, UNIT_INTERVAL), ret;
+               = 24 * 3600 * OPT_UINT32_VAL(DSS, UNIT_INTERVAL), ret,
+               last_completion_time;
        unsigned wanted = desired_number_of_snapshots(0,
                OPT_UINT32_VAL(DSS, NUM_INTERVALS)),
                num_complete = 0;
@@ -427,6 +428,7 @@ static int64_t compute_next_snapshot_time(void)
                        continue;
                num_complete++;
                x += s->completion_time - s->creation_time;
+               last_completion_time = s->completion_time;
        }
        assert(x >= 0);
 
@@ -436,7 +438,7 @@ static int64_t compute_next_snapshot_time(void)
        x /= num_complete; /* avg time to create one snapshot */
        if (unit_interval < x * wanted) /* oops, no sleep at all */
                goto out;
-       ret = s->completion_time + unit_interval / wanted - x;
+       ret = last_completion_time + unit_interval / wanted - x;
 out:
        free_snapshot_list(&sl);
        return ret;
@@ -1299,9 +1301,7 @@ static int handle_signal(void)
        switch (sig) {
        case SIGINT:
        case SIGTERM:
-               kill_children();
-               ret = -E_SIGNAL;
-               break;
+               return -E_SIGNAL;
        case SIGHUP:
                ret = handle_sighup();
                break;
@@ -1417,14 +1417,35 @@ static void create_rsync_argv(char ***argv, int64_t *num)
        } else
                DSS_INFO_LOG(("no suitable reference snapshot found\n"));
        logname = dss_logname();
-       if (use_rsync_locally(logname))
-               (*argv)[i++] = dss_strdup(OPT_STRING_VAL(DSS, SOURCE_DIR));
-       else
-               (*argv)[i++] = make_message("%s@%s:%s/",
-                       OPT_GIVEN(DSS, REMOTE_USER)?
-                               OPT_STRING_VAL(DSS, REMOTE_USER) : logname,
-                       OPT_STRING_VAL(DSS, REMOTE_HOST),
-                       OPT_STRING_VAL(DSS, SOURCE_DIR));
+       N = OPT_GIVEN(DSS, SOURCE_DIR);
+       if (use_rsync_locally(logname)) {
+               for (j = 0; j < N; j++)
+                       (*argv)[i++] = dss_strdup(lls_string_val(j,
+                               OPT_RESULT(DSS, SOURCE_DIR)));
+       } else {
+               /*
+                * dss-1.0 and earlier did not support multiple source
+                * directories.  These versions appended a slash to the end of
+                * the source directory to make sure that only the contents of
+                * the single source directory, but not the directory itself,
+                * are copied to the destination. For multiple source
+                * directories, however, this is not a good idea because the
+                * source directories may well contain identical file names,
+                * which would then be copied to the same location on the
+                * destination, overwriting each other. Moreover, we want the
+                * directory on the destination match the source. To preserve
+                * the old behaviour, we thus have to special-case N=1.
+                */
+               for (j = 0; j < N; j++) {
+                       (*argv)[i++] = make_message("%s@%s:%s%s",
+                               OPT_GIVEN(DSS, REMOTE_USER)?
+                                       OPT_STRING_VAL(DSS, REMOTE_USER) : logname,
+                               OPT_STRING_VAL(DSS, REMOTE_HOST),
+                               lls_string_val(j, OPT_RESULT(DSS, SOURCE_DIR)),
+                               N == 1? "/" : ""
+                       );
+               }
+       }
        free(logname);
        *num = get_current_time();
        (*argv)[i++] = incomplete_name(*num);
@@ -1448,6 +1469,7 @@ static int create_snapshot(char **argv)
 {
        int ret;
 
+       assert(argv);
        ret = rename_resume_snap(current_snapshot_creation_time);
        if (ret < 0)
                return ret;
@@ -1777,7 +1799,7 @@ static void handle_version_and_help(void)
        else if (OPT_GIVEN(DSS, HELP))
                txt = lls_short_help(CMD_PTR(DSS));
        else if (OPT_GIVEN(DSS, VERSION))
-               txt = dss_strdup(VERSION_STRING);
+               txt = make_message("%s\n", VERSION_STRING);
        else
                return;
        printf("%s", txt);