Renamed several exclude-related functions/variables using new

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index b090f66..b45a980 100644 (file)
--- a/main.c
+++ b/main.c
@@ -33,8 +33,9 @@ extern int verbose;
 extern int blocking_io;
 extern int cvs_exclude;
 extern int delete_mode;
-extern int delete_excluded;
+extern int delete_before;
 extern int delete_after;
+extern int delete_excluded;
 extern int daemon_over_rsh;
 extern int do_stats;
 extern int dry_run;
@@ -433,7 +434,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
                        argv[i] += l+1;
        }
 
-       if (argc == 0 && recurse) {
+       if (argc == 0 && (recurse || list_only)) {
                argc = 1;
                argv--;
                argv[0] = ".";
@@ -473,9 +474,9 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        if (preserve_hard_links)
                init_hard_links(flist);
 
-       if (!delete_after) {
+       if (delete_before) {
                /* I moved this here from recv_files() to prevent a race condition */
-               if (recurse && delete_mode && !local_name && flist->count > 0)
+               if (recurse && !local_name && flist->count > 0)
                        delete_files(flist);
        }
 
@@ -595,7 +596,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 
        io_start_buffering_in();
        if (delete_mode && !delete_excluded)
-               recv_exclude_list(f_in);
+               recv_filter_list(f_in);
 
        if (filesfrom_fd >= 0) {
                /* We need to send the files-from names to the sender at the
@@ -649,7 +650,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */
 
-               recv_exclude_list(f_in);
+               recv_filter_list(f_in);
                if (cvs_exclude)
                        add_cvs_excludes();
                do_server_sender(f_in, f_out, argc, argv);
@@ -700,7 +701,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                if (cvs_exclude)
                        add_cvs_excludes();
                if (delete_mode && !delete_excluded)
-                       send_exclude_list(f_out);
+                       send_filter_list(f_out);
                if (remote_filesfrom_file)
                        filesfrom_fd = f_in;
 
@@ -731,10 +732,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
        }
 
        if (argc == 0)
-               list_only = 1;
+               list_only |= 1;
 
        if (!read_batch)
-               send_exclude_list(f_out);
+               send_filter_list(f_out);
+       if (cvs_exclude)
+               add_cvs_excludes();
 
        if (filesfrom_fd >= 0) {
                io_set_filesfrom_fds(filesfrom_fd, f_out);
@@ -962,9 +965,8 @@ static int start_client(int argc, char *argv[])
        }
 
        /* ... or no dest at all */
-       if (!am_sender && argc == 0) {
-               list_only = 1;
-       }
+       if (!am_sender && argc == 0)
+               list_only |= 1;
 
        pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,
                     &f_in,&f_out);