New logging categories added to allow differentiation between

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index ddf4fd6..33d5b94 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,13 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
 
 extern int verbose;
+extern int dry_run;
 extern int do_xfers;
 extern int am_server;
 extern int am_daemon;
@@ -34,6 +34,7 @@ extern int csum_length;
 extern int append_mode;
 extern int io_error;
 extern int allowed_lull;
+extern int preserve_xattrs;
 extern int protocol_version;
 extern int remove_source_files;
 extern int updating_basis_file;
@@ -43,7 +44,7 @@ extern int inplace;
 extern int batch_fd;
 extern int write_batch;
 extern struct stats stats;
-extern struct file_list *cur_flist, *first_flist;
+extern struct file_list *cur_flist, *first_flist, *dir_flist;
 
 /**
  * @file
@@ -134,7 +135,7 @@ void successful_send(int ndx)
        }
 
        file = flist->files[ndx - flist->ndx_start];
-       if (!push_flist_dir(F_ROOTDIR(file), -1))
+       if (!push_pathname(F_PATHNAME(file), -1))
                return;
        f_name(file, fname);
 
@@ -145,8 +146,9 @@ void successful_send(int ndx)
                rsyserr(FERROR, errno, "sender failed to remove %s", fname);
 }
 
-void write_ndx_and_attrs(int f_out, int ndx, int iflags,
-                        uchar fnamecmp_type, char *buf, int len)
+static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
+                               const char *fname, struct file_struct *file,
+                               uchar fnamecmp_type, char *buf, int len)
 {
        write_ndx(f_out, ndx);
        if (protocol_version < 29)
@@ -156,6 +158,10 @@ void write_ndx_and_attrs(int f_out, int ndx, int iflags,
                write_byte(f_out, fnamecmp_type);
        if (iflags & ITEM_XNAME_FOLLOWS)
                write_vstring(f_out, buf, len);
+#ifdef SUPPORT_XATTRS
+       if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+               send_xattr_request(fname, file, f_out);
+#endif
 }
 
 void send_files(int f_in, int f_out)
@@ -181,11 +187,11 @@ void send_files(int f_in, int f_out)
 
        while (1) {
                if (inc_recurse)
-                       send_extra_file_list(f_out, 1000);
+                       send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
 
                /* This call also sets cur_flist. */
-               ndx = read_ndx_and_attrs(f_in, f_out, &iflags,
-                                        &fnamecmp_type, xname, &xlen);
+               ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+                                        xname, &xlen);
                if (ndx == NDX_DONE) {
                        if (inc_recurse && first_flist) {
                                flist_free(first_flist);
@@ -202,22 +208,35 @@ void send_files(int f_in, int f_out)
                        continue;
                }
 
-               file = cur_flist->files[ndx - cur_flist->ndx_start];
-               if (F_ROOTDIR(file)) {
-                       path = F_ROOTDIR(file);
+               if (inc_recurse)
+                       send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
+
+               if (ndx - cur_flist->ndx_start >= 0)
+                       file = cur_flist->files[ndx - cur_flist->ndx_start];
+               else
+                       file = dir_flist->files[cur_flist->parent_ndx];
+               if (F_PATHNAME(file)) {
+                       path = F_PATHNAME(file);
                        slash = "/";
                } else {
                        path = slash = "";
                }
-               if (!push_flist_dir(F_ROOTDIR(file), -1))
+               if (!push_pathname(F_PATHNAME(file), -1))
                        continue;
                f_name(file, fname);
 
                if (verbose > 2)
                        rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
 
+#ifdef SUPPORT_XATTRS
+               if (preserve_xattrs && iflags & ITEM_REPORT_XATTR)
+                       recv_xattr_request(file, f_in);
+#endif
+
                if (!(iflags & ITEM_TRANSFER)) {
                        maybe_log_item(file, iflags, itemizing, xname);
+                       write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+                                           fnamecmp_type, xname, xlen);
                        continue;
                }
                if (phase == 2) {
@@ -252,8 +271,8 @@ void send_files(int f_in, int f_out)
 
                if (!do_xfers) { /* log the transfer */
                        log_item(FCLIENT, file, &stats, iflags, NULL);
-                       write_ndx_and_attrs(f_out, ndx, iflags, fnamecmp_type,
-                                           xname, xlen);
+                       write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+                                           fnamecmp_type, xname, xlen);
                        continue;
                }
 
@@ -270,13 +289,13 @@ void send_files(int f_in, int f_out)
                        if (errno == ENOENT) {
                                enum logcode c = am_daemon
                                    && protocol_version < 28 ? FERROR
-                                                            : FINFO;
+                                                            : FWARNING;
                                io_error |= IOERR_VANISHED;
                                rprintf(c, "file has vanished: %s\n",
                                        full_fname(fname));
                        } else {
                                io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR, errno,
+                               rsyserr(FERROR_XFER, errno,
                                        "send_files failed to open %s",
                                        full_fname(fname));
                        }
@@ -306,8 +325,8 @@ void send_files(int f_in, int f_out)
                                path,slash,fname, (double)st.st_size);
                }
 
-               write_ndx_and_attrs(f_out, ndx, iflags, fnamecmp_type,
-                                   xname, xlen);
+               write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+                                   fnamecmp_type, xname, xlen);
                write_sum_head(f_xfer, s);
 
                if (verbose > 2)
@@ -330,7 +349,7 @@ void send_files(int f_in, int f_out)
                        j = unmap_file(mbuf);
                        if (j) {
                                io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR, j,
+                               rsyserr(FERROR_XFER, j,
                                        "read errors mapping %s",
                                        full_fname(fname));
                        }