*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 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
- * 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,
* 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 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;
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
if (!remove_source_files)
return;
- if (!(flist = flist_for_ndx(ndx))) {
- rprintf(FERROR,
- "INTERNAL ERROR: unable to find flist for item %d\n",
- ndx);
- return;
- }
-
+ flist = flist_for_ndx(ndx, "successful_send");
file = flist->files[ndx - flist->ndx_start];
- if (!push_flist_dir(F_ROOTDIR(file), -1))
+ if (!change_pathname(file, NULL, 0))
return;
f_name(file, fname);
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)
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 && do_xfers)
+ send_xattr_request(fname, file, f_out);
+#endif
}
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);
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 (!change_pathname(file, NULL, 0))
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 && do_xfers)
+ 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) {
updating_basis_file = inplace && (protocol_version >= 29
? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0);
- stats.current_file_index = ndx;
+ if (!am_server && do_progress)
+ set_current_file_index(file, ndx);
stats.num_transferred_files++;
stats.total_transferred_size += F_LENGTH(file);
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;
}
if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
- rprintf(FERROR, "receive_sums failed\n");
+ rprintf(FERROR_XFER, "receive_sums failed\n");
exit_cleanup(RERR_PROTOCOL);
}
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));
}
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "fstat failed");
+ rsyserr(FERROR_XFER, errno, "fstat failed");
free_sums(s);
close(fd);
exit_cleanup(RERR_PROTOCOL);
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)
j = unmap_file(mbuf);
if (j) {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, j,
+ rsyserr(FERROR_XFER, j,
"read errors mapping %s",
full_fname(fname));
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff