Tweaked the option-passing code's delete logic to make it cleaner.
authorWayne Davison <wayned@samba.org>
Wed, 13 Dec 2006 14:52:59 +0000 (14:52 +0000)
committerWayne Davison <wayned@samba.org>
Wed, 13 Dec 2006 14:52:59 +0000 (14:52 +0000)
options.c

index cd6ed54..304704b 100644 (file)
--- 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";