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

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index be8ae39..8ba45a2 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;
@@ -149,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;
        }
@@ -161,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) {
@@ -182,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",
@@ -208,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();
@@ -477,7 +496,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);
        }
 
@@ -597,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
@@ -651,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);
@@ -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;
 
@@ -736,7 +757,9 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                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);