From: Wayne Davison <wayned@samba.org>
Date: Wed, 13 Dec 2006 14:52:59 +0000 (+0000)
Subject: Tweaked the option-passing code's delete logic to make it cleaner.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/0d152437dff56d2dfcbd8050d4be07a589ae0073

Tweaked the option-passing code's delete logic to make it cleaner.
---

diff --git a/options.c b/options.c
index cd6ed540..304704b0 100644
--- a/options.c
+++ b/options.c
@@ -1666,11 +1666,11 @@ void server_options(char **args,int *argc)
 			args[ac++] = "--delete";
 		if (delete_before > 1)
 			args[ac++] = "--delete-before";
-		if (delete_during) {
-			args[ac++] = delete_during == 2 ? "--delete-delay"
-							: "--delete-during";
-		}
-		if (delete_after)
+		else if (delete_during == 2)
+			args[ac++] = "--delete-delay";
+		else if (delete_during)
+			args[ac++] = "--delete-during";
+		else if (delete_after)
 			args[ac++] = "--delete-after";
 		if (force_delete)
 			args[ac++] = "--force";