X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dss.c;h=9589f9dd38a18c756419e55c5f62c044aa9be2cf;hb=50f26b35ac30d13240d501eba6dae819a9a400c7;hp=93ab802cb123bddde776042a9a9cff266102091c;hpb=64964f0639b13787a06bea76f922cba18731807c;p=dss.git

diff --git a/dss.c b/dss.c
index 93ab802..9589f9d 100644
--- a/dss.c
+++ b/dss.c
@@ -506,6 +506,7 @@ static int post_create_hook(void)
 	char *cmd;
 
 	if (!conf.post_create_hook_given) {
+		create_pid = 0;
 		snapshot_creation_status = HS_READY;
 		return 0;
 	}
@@ -966,6 +967,32 @@ static int use_rsync_locally(char *logname)
 	return 1;
 }
 
+static int rename_resume_snap(int64_t creation_time)
+{
+	struct snapshot_list sl = {.num_snapshots = 0};
+	struct snapshot *s;
+	char *new_name = incomplete_name(creation_time);
+	int ret;
+
+	ret = 0;
+	if (conf.no_resume_given)
+		goto out;
+	dss_get_snapshot_list(&sl);
+	s = get_newest_snapshot(&sl);
+	if (!s)
+		goto out;
+	if ((s->flags & SS_COMPLETE) != 0) /* complete */
+		goto out;
+	DSS_INFO_LOG("resuming: reusing %s as destination dir\n", s->name);
+	ret = dss_rename(s->name, new_name);
+out:
+	if (ret >= 0)
+		DSS_NOTICE_LOG("creating new snapshot %s\n", new_name);
+	free(new_name);
+	free_snapshot_list(&sl);
+	return ret;
+}
+
 static void create_rsync_argv(char ***argv, int64_t *num)
 {
 	char *logname;
@@ -1018,11 +1045,10 @@ static void free_rsync_argv(char **argv)
 static int create_snapshot(char **argv)
 {
 	int ret, fds[3] = {0, 0, 0};
-	char *name;
 
-	name = incomplete_name(current_snapshot_creation_time);
-	DSS_NOTICE_LOG("creating new snapshot %s\n", name);
-	free(name);
+	ret = rename_resume_snap(current_snapshot_creation_time);
+	if (ret < 0)
+		return ret;
 	ret = dss_exec(&create_pid, argv[0], argv, fds);
 	if (ret < 0)
 		return ret;