From: Wayne Davison <wayned@samba.org>
Date: Sun, 12 Apr 2009 19:57:31 +0000 (-0700)
Subject: Don't allow --remove-s*-files with --read-batch.
X-Git-Tag: v3.0.6pre1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9be5093726d73826b63f18435940bbe1afddc66c;p=thirdparty%2Frsync.git

Don't allow --remove-s*-files with --read-batch.
---

diff --git a/NEWS b/NEWS
index 836d4768..45ff1bdd 100644
--- a/NEWS
+++ b/NEWS
@@ -47,3 +47,6 @@ Changes since 3.0.5:
 
     - Fixed a run-time issue for systems that can't find iconv_open() by adding
       the --disable-iconv-open configure option.
+
+    - Complain and die if the user tries to combine --remove-source-files (or
+      the deprecated --remove-sent-files) with --read-batch.
diff --git a/options.c b/options.c
index 75fa1ab6..b6f7bae4 100644
--- a/options.c
+++ b/options.c
@@ -1357,6 +1357,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			"--read-batch cannot be used with --files-from\n");
 		return 0;
 	}
+	if (read_batch && remove_source_files) {
+		snprintf(err_buf, sizeof err_buf,
+			"--read-batch cannot be used with --remove-%s-files\n",
+			remove_source_files == 1 ? "source" : "sent");
+		return 0;
+	}
 	if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {
 		snprintf(err_buf, sizeof err_buf,
 			"the batch-file name must be %d characters or less.\n",