Add support for transferring & setting nsec time values.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index ed6a736..e3a896a 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
 #include "rsync.h"
 #include "inums.h"
 
-extern int dry_run;
 extern int do_xfers;
 extern int am_server;
 extern int am_daemon;
@@ -152,7 +151,7 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
        if (iflags & ITEM_XNAME_FOLLOWS)
                write_vstring(f_out, buf, len);
 #ifdef SUPPORT_XATTRS
-       if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+       if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
                send_xattr_request(fname, file, f_out);
 #endif
 }
@@ -173,6 +172,7 @@ void send_files(int f_in, int f_out)
        int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
        enum logcode log_code = log_before_transfer ? FLOG : FINFO;
        int f_xfer = write_batch < 0 ? batch_fd : f_out;
+       int save_io_error = io_error;
        int ndx, j;
 
        if (DEBUG_GTE(SEND, 1))
@@ -180,7 +180,7 @@ void send_files(int f_in, int f_out)
 
        while (1) {
                if (inc_recurse)
-                       send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
+                       send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD);
 
                /* This call also sets cur_flist. */
                ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
@@ -201,14 +201,12 @@ void send_files(int f_in, int f_out)
                                break;
                        if (DEBUG_GTE(SEND, 1))
                                rprintf(FINFO, "send_files phase=%d\n", phase);
-                       if (phase == 2)
-                               read_del_stats(f_in);
                        write_ndx(f_out, NDX_DONE);
                        continue;
                }
 
                if (inc_recurse)
-                       send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
+                       send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD);
 
                if (ndx - cur_flist->ndx_start >= 0)
                        file = cur_flist->files[ndx - cur_flist->ndx_start];
@@ -228,7 +226,7 @@ void send_files(int f_in, int f_out)
                        rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
 
 #ifdef SUPPORT_XATTRS
-               if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+               if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
                        recv_xattr_request(file, f_in);
 #endif
 
@@ -384,6 +382,9 @@ void send_files(int f_in, int f_out)
        if (make_backups < 0)
                make_backups = -make_backups;
 
+       if (io_error != save_io_error && protocol_version >= 30)
+               send_msg_int(MSG_IO_ERROR, io_error);
+
        if (DEBUG_GTE(SEND, 1))
                rprintf(FINFO, "send files finished\n");