Use "#if" (not "#ifdef") for configure-defined macros.

[rsync.git] / main.c

diff --git a/main.c b/main.c
index 7ff33f55e73e67db9547d9a5ab9d5897e5959b85..8ba45a262d15da75ed0b0edb457e506e1f084ae5 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;
@@ -59,6 +60,7 @@ extern int filesfrom_fd;
 extern pid_t cleanup_child_pid;
 extern char *files_from;
 extern char *remote_filesfrom_file;
+extern char *partial_dir;
 extern char *basis_dir[];
 extern char *rsync_path;
 extern char *shell_cmd;
@@ -146,6 +148,10 @@ static void report(int f)
                        write_longint(f, total_read);
                        write_longint(f, total_written);
                        write_longint(f, stats.total_size);
+                       if (protocol_version >= 29) {
+                               write_longint(f, stats.flist_buildtime);
+                               write_longint(f, stats.flist_xfertime);
+                       }
                }
                return;
        }
@@ -158,12 +164,20 @@ static void report(int f)
                total_written = read_longint(f);
                total_read = read_longint(f);
                stats.total_size = read_longint(f);
+               if (protocol_version >= 29) {
+                       stats.flist_buildtime = read_longint(f);
+                       stats.flist_xfertime = read_longint(f);
+               }
        } else if (write_batch) {
                /* The --read-batch process is going to be a client
                 * receiver, so we need to give it the stats. */
                write_longint(batch_fd, total_read);
                write_longint(batch_fd, total_written);
                write_longint(batch_fd, stats.total_size);
+               if (protocol_version >= 29) {
+                       write_longint(batch_fd, stats.flist_buildtime);
+                       write_longint(batch_fd, stats.flist_xfertime);
+               }
        }
 
        if (do_stats) {
@@ -179,6 +193,14 @@ static void report(int f)
                rprintf(FINFO,"Matched data: %.0f bytes\n",
                        (double)stats.matched_data);
                rprintf(FINFO,"File list size: %d\n", stats.flist_size);
+               if (stats.flist_buildtime) {
+                       rprintf(FINFO,
+                               "File list generation time: %.3f seconds\n",
+                               (double)stats.flist_buildtime / 1000);
+                       rprintf(FINFO,
+                               "File list transfer time: %.3f seconds\n",
+                               (double)stats.flist_xfertime / 1000);
+               }
                rprintf(FINFO,"Total bytes sent: %.0f\n",
                        (double)total_written);
                rprintf(FINFO,"Total bytes received: %.0f\n",
@@ -205,7 +227,7 @@ static void report(int f)
  **/
 static void show_malloc_stats(void)
 {
-#ifdef HAVE_MALLINFO
+#if HAVE_MALLINFO
        struct mallinfo mi;
 
        mi = mallinfo();
@@ -432,7 +454,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] = ".";
@@ -463,7 +485,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        int pid;
        int status = 0;
        int error_pipe[2], name_pipe[2];
-       BOOL need_name_pipe = basis_dir[0] && !dry_run;
+       BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !dry_run;
 
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
@@ -472,9 +494,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);
        }
 
@@ -540,7 +562,6 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        generate_files(f_out, flist, local_name, name_pipe[1]);
 
-       get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);
        io_flush(FULL_FLUSH);
        if (protocol_version >= 24) {
@@ -595,7 +616,9 @@ 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 (cvs_exclude)
+               add_cvs_excludes();
 
        if (filesfrom_fd >= 0) {
                /* We need to send the files-from names to the sender at the
@@ -649,7 +672,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);
@@ -671,9 +694,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
        char *local_name = NULL;
 
        cleanup_child_pid = pid;
-       if (read_batch) {
-               assert(am_sender == 0);
-       } else {
+       if (!read_batch) {
                set_nonblocking(f_in);
                set_nonblocking(f_out);
        }
@@ -702,7 +723,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;
 
@@ -733,10 +754,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);
@@ -964,9 +987,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);