Go back to requiring -r for deletes to happen.

diff --git a/main.c b/main.c
index be8ae39..086de30 100644 (file)
--- a/main.c
+++ b/main.c
@@ -45,7 +45,6 @@ extern int log_got_error;
 extern int module_id;
 extern int orig_umask;
 extern int copy_links;
-extern int keep_dirs;
 extern int keep_dirlinks;
 extern int preserve_hard_links;
 extern int protocol_version;
@@ -477,7 +476,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        if (delete_before) {
                /* I moved this here from recv_files() to prevent a race condition */
-               if (keep_dirs && !local_name && flist->count > 0)
+               if (recurse && !local_name && flist->count > 0)
                        delete_files(flist);
        }
 

diff --git a/receiver.c b/receiver.c
index 76508bf..bb3097a 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -21,6 +21,7 @@
 #include "rsync.h"
 
 extern int verbose;
+extern int recurse;
 extern int delete_after;
 extern int max_delete;
 extern int csum_length;
@@ -31,7 +32,6 @@ extern int batch_gen_fd;
 extern int am_server;
 extern int protocol_version;
 extern int relative_paths;
-extern int keep_dirs;
 extern int keep_dirlinks;
 extern int preserve_hard_links;
 extern int preserve_perms;
@@ -600,7 +600,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
        }
        make_backups = save_make_backups;
 
-       if (delete_after && keep_dirs && !local_name && flist->count > 0)
+       if (delete_after && recurse && !local_name && flist->count > 0)
                delete_files(flist);
 
        if (verbose > 2)