*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2009 Wayne Davison
+ * Copyright (C) 2003-2022 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
extern int do_xfers;
extern int am_server;
extern int am_daemon;
+extern int local_server;
extern int inc_recurse;
extern int log_before_transfer;
extern int stdout_format_has_i;
extern int logfile_format_has_i;
+extern int want_xattr_optim;
extern int csum_length;
extern int append_mode;
+extern int copy_links;
extern int io_error;
extern int flist_eof;
+extern int whole_file;
extern int allowed_lull;
+extern int copy_devices;
extern int preserve_xattrs;
extern int protocol_version;
extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
extern int inplace;
+extern int inplace_partial;
extern int batch_fd;
extern int write_batch;
+extern int file_old_total;
+extern BOOL want_progress_now;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
+extern char num_dev_ino_buf[4 + 8 + 8];
BOOL extra_flist_sending_enabled;
**/
static struct sum_struct *receive_sums(int f)
{
- struct sum_struct *s;
- int32 i;
- int lull_mod = allowed_lull * 5;
+ struct sum_struct *s = new(struct sum_struct);
+ int lull_mod = protocol_version >= 31 ? 0 : allowed_lull * 5;
OFF_T offset = 0;
-
- if (!(s = new(struct sum_struct)))
- out_of_memory("receive_sums");
+ int32 i;
read_sum_head(f, s);
if (s->count == 0)
return(s);
- if (!(s->sums = new_array(struct sum_buf, s->count)))
- out_of_memory("receive_sums");
+ s->sums = new_array(struct sum_buf, s->count);
for (i = 0; i < s->count; i++) {
s->sums[i].sum1 = read_int(f);
s->sums[i].len = s->blength;
offset += s->sums[i].len;
- if (allowed_lull && !(i % lull_mod))
- maybe_send_keepalive();
+ if (lull_mod && !(i % lull_mod))
+ maybe_send_keepalive(time(NULL), True);
if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
void successful_send(int ndx)
{
char fname[MAXPATHLEN];
+ char *failed_op;
struct file_struct *file;
struct file_list *flist;
+ STRUCT_STAT st;
if (!remove_source_files)
return;
return;
f_name(file, fname);
- if (do_unlink(fname) == 0) {
+ if ((copy_links ? do_stat(fname, &st) : do_lstat(fname, &st)) < 0) {
+ failed_op = "re-lstat";
+ goto failed;
+ }
+
+ if (local_server
+ && (int64)st.st_dev == IVAL64(num_dev_ino_buf, 4)
+ && (int64)st.st_ino == IVAL64(num_dev_ino_buf, 4 + 8)) {
+ rprintf(FERROR_XFER, "ERROR: Skipping sender remove of destination file: %s\n", fname);
+ return;
+ }
+
+ if (st.st_size != F_LENGTH(file) || st.st_mtime != file->modtime
+#ifdef ST_MTIME_NSEC
+ || (NSEC_BUMP(file) && (uint32)st.ST_MTIME_NSEC != F_MOD_NSEC(file))
+#endif
+ ) {
+ rprintf(FERROR_XFER, "ERROR: Skipping sender remove for changed file: %s\n", fname);
+ return;
+ }
+
+ if (do_unlink(fname) < 0) {
+ failed_op = "remove";
+ failed:
+ if (errno == ENOENT)
+ rprintf(FINFO, "sender file already removed: %s\n", fname);
+ else
+ rsyserr(FERROR_XFER, errno, "sender failed to %s %s", failed_op, fname);
+ } else {
if (INFO_GTE(REMOVE, 1))
rprintf(FINFO, "sender removed %s\n", fname);
- } else
- rsyserr(FERROR, errno, "sender failed to remove %s", fname);
+ }
}
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 && do_xfers)
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
+ && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
send_xattr_request(fname, file, f_out);
#endif
}
int iflags, xlen;
struct file_struct *file;
int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1;
- struct stats initial_stats;
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;
if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
+ if (whole_file < 0)
+ whole_file = 0;
+
+ progress_init();
+
while (1) {
if (inc_recurse) {
send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD);
extra_flist_sending_enabled = False;
if (ndx == NDX_DONE) {
- if (!am_server && INFO_GTE(PROGRESS, 2) && cur_flist) {
+ if (!am_server && cur_flist) {
set_current_file_index(NULL, 0);
- end_progress(0);
+ if (INFO_GTE(PROGRESS, 2))
+ end_progress(0);
}
if (inc_recurse && first_flist) {
+ file_old_total -= first_flist->used;
flist_free(first_flist);
if (first_flist) {
+ if (first_flist == cur_flist)
+ file_old_total = cur_flist->used;
write_ndx(f_out, NDX_DONE);
continue;
}
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)
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
+ && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
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);
+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file, fnamecmp_type, xname, xlen);
if (iflags & ITEM_IS_NEW) {
stats.created_files++;
if (S_ISREG(file->mode)) {
stats.created_files++;
}
- updating_basis_file = inplace && (protocol_version >= 29
- ? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0);
+ updating_basis_file = (inplace_partial && fnamecmp_type == FNAMECMP_PARTIAL_DIR)
+ || (inplace && (protocol_version >= 29 ? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0));
- if (!am_server && INFO_GTE(PROGRESS, 1))
+ if (!am_server)
set_current_file_index(file, ndx);
stats.xferred_files++;
stats.total_transferred_size += F_LENGTH(file);
+ remember_initial_stats();
+
if (!do_xfers) { /* log the transfer */
- log_item(FCLIENT, file, &stats, iflags, NULL);
- write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
- fnamecmp_type, xname, xlen);
+ log_item(FCLIENT, file, iflags, NULL);
+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file, fnamecmp_type, xname, xlen);
continue;
}
- initial_stats = stats;
-
if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
rprintf(FERROR_XFER, "receive_sums failed\n");
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENOENT) {
- enum logcode c = am_daemon
- && protocol_version < 28 ? FERROR
- : FWARNING;
+ enum logcode c = am_daemon && protocol_version < 28 ? FERROR : FWARNING;
io_error |= IOERR_VANISHED;
rprintf(c, "file has vanished: %s\n",
full_fname(fname));
rsyserr(FERROR_XFER, errno, "fstat failed");
free_sums(s);
close(fd);
- exit_cleanup(RERR_PROTOCOL);
+ exit_cleanup(RERR_FILEIO);
+ }
+
+ if (IS_DEVICE(st.st_mode)) {
+ if (!copy_devices) {
+ rprintf(FERROR, "attempt to copy device contents without --copy-devices\n");
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ if (st.st_size == 0)
+ st.st_size = get_device_size(fd, fname);
+ }
+
+ if (append_mode > 0 && st.st_size < F_LENGTH(file)) {
+ rprintf(FWARNING, "skipped diminished file: %s\n",
+ full_fname(fname));
+ free_sums(s);
+ close(fd);
+ if (protocol_version >= 30)
+ send_msg_int(MSG_NO_SEND, ndx);
+ continue;
}
if (st.st_size) {
path,slash,fname, big_num(st.st_size));
}
- write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
- 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 (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname);
if (log_before_transfer)
- log_item(FCLIENT, file, &initial_stats, iflags, NULL);
+ log_item(FCLIENT, file, iflags, NULL);
else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
rprintf(FCLIENT, "%s\n", fname);
match_sums(f_xfer, s, mbuf, st.st_size);
if (INFO_GTE(PROGRESS, 1))
end_progress(st.st_size);
+ else if (want_progress_now)
+ instant_progress(fname);
- log_item(log_code, file, &initial_stats, iflags, NULL);
+ log_item(log_code, file, iflags, NULL);
if (mbuf) {
j = unmap_file(mbuf);
git.samba.org / rsync.git / blobdiff