From 89fb50263bcd695774804a1227b0a4c4a62d812c Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 28 Mar 2006 23:09:36 +0000
Subject: [PATCH] - Complain if the user specified --delete without -r or -d. -
 Got rid of the saw_delete_* vars.

---
 options.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/options.c b/options.c
index 7eb419fd..6f26bea8 100644
--- a/options.c
+++ b/options.c
@@ -58,8 +58,6 @@ int cvs_exclude = 0;
 int dry_run = 0;
 int do_xfers = 1;
 int ignore_times = 0;
-int saw_delete_opt = 0;
-int saw_delete_excluded_opt = 0;
 int delete_mode = 0;
 int delete_during = 0;
 int delete_before = 0;
@@ -1178,11 +1176,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		}
 		delete_mode = delete_before = 1;
 	}
-	saw_delete_opt = delete_mode;
-	saw_delete_excluded_opt = delete_excluded;
-	if (!xfer_dirs) {
-		delete_before = delete_during = delete_after = 0;
-		delete_mode = delete_excluded = 0;
+	if (!xfer_dirs && delete_mode) {
+		snprintf(err_buf, sizeof err_buf,
+			"--delete does not work without -r or -d.\n");
+		return 0;
 	}
 
 	if (delete_mode && refused_delete) {
-- 
2.34.1