X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=3e626ab0113b1890277da115ea6c735dbdb690d7;hp=6f0d759db4a71084f04967f7f32aa65ea68dd394;hb=2af5575f983be85475a72882a261731e99098b02;hpb=6c63f45a9068107cfd80aa181134574dd9373c0b

diff --git a/dss.c b/dss.c
index 6f0d759..3e626ab 100644
--- a/dss.c
+++ b/dss.c
@@ -1055,9 +1055,15 @@ static int handle_sigchld(void)
 
 static int change_to_dest_dir(void)
 {
+	int ret;
 	const char *dd = OPT_STRING_VAL(DSS, DEST_DIR);
+
 	DSS_INFO_LOG(("changing cwd to %s\n", dd));
-	return dss_chdir(dd);
+	if (chdir(dd) >= 0)
+		return 1;
+	ret = -ERRNO_TO_DSS_ERROR(errno);
+	DSS_ERROR_LOG(("could not change cwd to %s\n", dd));
+	return ret;
 }
 
 static int check_config(const struct lls_command *cmd)
@@ -1341,6 +1347,7 @@ static void create_rsync_argv(char ***argv, int64_t *num)
 	char *logname;
 	int i = 0, j, N = OPT_GIVEN(DSS, RSYNC_OPTION);
 	struct snapshot_list sl;
+	static bool seeded;
 
 	dss_get_snapshot_list(&sl);
 	assert(!name_of_reference_snapshot);
@@ -1351,6 +1358,14 @@ static void create_rsync_argv(char ***argv, int64_t *num)
 	(*argv)[i++] = dss_strdup("rsync");
 	(*argv)[i++] = dss_strdup("-a");
 	(*argv)[i++] = dss_strdup("--delete");
+	if (!seeded) {
+		srandom((unsigned)time(NULL)); /* no need to be fancy here */
+		seeded = true;
+	}
+	if (1000 * (random() / (RAND_MAX + 1.0)) < OPT_UINT32_VAL(DSS, CHECKSUM)) {
+		DSS_NOTICE_LOG(("adding --checksum to rsync options\n"));
+		(*argv)[i++] = dss_strdup("--checksum");
+	}
 	for (j = 0; j < N; j++)
 		(*argv)[i++] = dss_strdup(lls_string_val(j,
 			OPT_RESULT(DSS, RSYNC_OPTION)));
@@ -1511,11 +1526,20 @@ static void lock_dss_or_die(void)
 static int com_run(void)
 {
 	int ret, fd = -1;
+	char *config_file;
+	pid_t pid;
 
 	if (OPT_GIVEN(DSS, DRY_RUN)) {
 		DSS_ERROR_LOG(("dry run not supported by this command\n"));
 		return -E_SYNTAX;
 	}
+	config_file = get_config_file_name();
+	ret = get_dss_pid(config_file, &pid);
+	free(config_file);
+	if (ret >= 0) {
+		DSS_ERROR_LOG(("pid %d\n", (int)pid));
+		return -E_ALREADY_RUNNING;
+	}
 	if (OPT_GIVEN(RUN, DAEMON)) {
 		fd = daemon_init();
 		daemonized = true;