Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a union for idlist's name/max_id value. Fixes bug 8137.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
815371a
..
7b6d313
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-32,6
+32,7
@@
extern int logfile_format_has_i;
extern int csum_length;
extern int append_mode;
extern int io_error;
extern int csum_length;
extern int append_mode;
extern int io_error;
+extern int flist_eof;
extern int allowed_lull;
extern int preserve_xattrs;
extern int protocol_version;
extern int allowed_lull;
extern int preserve_xattrs;
extern int protocol_version;
@@
-41,9
+42,12
@@
extern int make_backups;
extern int inplace;
extern int batch_fd;
extern int write_batch;
extern int inplace;
extern int batch_fd;
extern int write_batch;
+extern int file_old_total;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
+BOOL extra_flist_sending_enabled;
+
/**
* @file
*
/**
* @file
*
@@
-59,7
+63,7
@@
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
int32 i;
{
struct sum_struct *s;
int32 i;
- int lull_mod = allowed_lull * 5;
+ int lull_mod =
protocol_version >= 31 ? 0 :
allowed_lull * 5;
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
@@
-100,8
+104,8
@@
static struct sum_struct *receive_sums(int f)
s->sums[i].len = s->blength;
offset += s->sums[i].len;
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,
if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
@@
-151,7
+155,8
@@
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 (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
+ && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
send_xattr_request(fname, file, f_out);
#endif
}
send_xattr_request(fname, file, f_out);
#endif
}
@@
-168,30
+173,37
@@
void send_files(int f_in, int f_out)
int iflags, xlen;
struct file_struct *file;
int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1;
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;
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))
rprintf(FINFO, "send_files starting\n");
while (1) {
int ndx, j;
if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
while (1) {
- if (inc_recurse)
+ if (inc_recurse)
{
send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD);
send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD);
+ extra_flist_sending_enabled = !flist_eof;
+ }
/* This call also sets cur_flist. */
/* This call also sets cur_flist. */
- ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ ndx = read_ndx_and_attrs(f_in,
f_out,
&iflags, &fnamecmp_type,
xname, &xlen);
xname, &xlen);
+ extra_flist_sending_enabled = False;
+
if (ndx == NDX_DONE) {
if (!am_server && INFO_GTE(PROGRESS, 2) && cur_flist) {
set_current_file_index(NULL, 0);
end_progress(0);
}
if (inc_recurse && first_flist) {
if (ndx == NDX_DONE) {
if (!am_server && INFO_GTE(PROGRESS, 2) && cur_flist) {
set_current_file_index(NULL, 0);
end_progress(0);
}
if (inc_recurse && first_flist) {
+ file_old_total -= first_flist->used;
flist_free(first_flist);
if (first_flist) {
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;
}
write_ndx(f_out, NDX_DONE);
continue;
}
@@
-225,7
+237,8
@@
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
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
+ && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
recv_xattr_request(file, f_in);
#endif
recv_xattr_request(file, f_in);
#endif
@@
-283,15
+296,16
@@
void send_files(int f_in, int f_out)
stats.xferred_files++;
stats.total_transferred_size += F_LENGTH(file);
stats.xferred_files++;
stats.total_transferred_size += F_LENGTH(file);
+ if (!log_before_transfer)
+ remember_initial_stats();
+
if (!do_xfers) { /* log the transfer */
if (!do_xfers) { /* log the transfer */
- log_item(FCLIENT, file,
&stats,
iflags, NULL);
+ log_item(FCLIENT, file, iflags, NULL);
write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
fnamecmp_type, xname, xlen);
continue;
}
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");
if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
rprintf(FERROR_XFER, "receive_sums failed\n");
@@
-325,7
+339,7
@@
void send_files(int f_in, int f_out)
rsyserr(FERROR_XFER, errno, "fstat failed");
free_sums(s);
close(fd);
rsyserr(FERROR_XFER, errno, "fstat failed");
free_sums(s);
close(fd);
- exit_cleanup(RERR_
PROTOCOL
);
+ exit_cleanup(RERR_
FILEIO
);
}
if (st.st_size) {
}
if (st.st_size) {
@@
-347,7
+361,7
@@
void send_files(int f_in, int f_out)
rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname);
if (log_before_transfer)
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);
else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
rprintf(FCLIENT, "%s\n", fname);
@@
-357,7
+371,7
@@
void send_files(int f_in, int f_out)
if (INFO_GTE(PROGRESS, 1))
end_progress(st.st_size);
if (INFO_GTE(PROGRESS, 1))
end_progress(st.st_size);
- log_item(log_code, file,
&initial_stats,
iflags, NULL);
+ log_item(log_code, file, iflags, NULL);
if (mbuf) {
j = unmap_file(mbuf);
if (mbuf) {
j = unmap_file(mbuf);
@@
-381,6
+395,9
@@
void send_files(int f_in, int f_out)
if (make_backups < 0)
make_backups = -make_backups;
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");
if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send files finished\n");