#include "rsync.h"
extern int verbose;
+extern int log_before_transfer;
extern int csum_length;
extern struct stats stats;
extern int io_error;
extern int protocol_version;
extern int updating_basis_file;
extern int make_backups;
+extern int do_progress;
extern int inplace;
+extern char *log_format;
extern struct stats stats;
static struct sum_struct *receive_sums(int f)
{
struct sum_struct *s;
- int i;
+ int32 i;
OFF_T offset = 0;
if (!(s = new(struct sum_struct)))
if (!(s->sums = new_array(struct sum_buf, s->count)))
out_of_memory("receive_sums");
- for (i = 0; i < (int)s->count; i++) {
+ for (i = 0; i < s->count; i++) {
s->sums[i].sum1 = read_int(f);
read_buf(f, s->sums[i].sum2, s->s2length);
s->sums[i].offset = offset;
s->sums[i].flags = 0;
- if (i == (int)s->count-1 && s->remainder != 0)
+ if (i == s->count-1 && s->remainder != 0)
s->sums[i].len = s->remainder;
else
s->sums[i].len = s->blength;
struct map_struct *mbuf = NULL;
STRUCT_STAT st;
char *fname2, fname[MAXPATHLEN];
- int i;
+ int iflags;
struct file_struct *file;
int phase = 0;
struct stats initial_stats;
int save_make_backups = make_backups;
- int j;
+ int i, j;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
exit_cleanup(RERR_PROTOCOL);
}
+ file = flist->files[i];
+
+ if (protocol_version >= 29) {
+ iflags = read_byte(f_in);
+ iflags |= read_byte(f_in) << 8;
+ if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
+ if (am_server) {
+ write_int(f_out, i);
+ write_byte(f_out, iflags);
+ write_byte(f_out, iflags >> 8);
+ } else
+ log_send(file, &stats, iflags);
+ continue;
+ }
+ } else
+ iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
+
if (inplace && protocol_version >= 29) {
uchar fnamecmp_type = read_byte(f_in);
updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
} else
updating_basis_file = inplace && !make_backups;
- file = flist->files[i];
+ if (!S_ISREG(file->mode)) {
+ rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
+ who_am_i(), i);
+ exit_cleanup(RERR_PROTOCOL);
+ }
stats.current_file_index = i;
stats.num_transferred_files++;
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
- if (dry_run) {
- if (!am_server && verbose) /* log the transfer */
- rprintf(FINFO, "%s\n", safe_fname(fname2));
+ if (dry_run) { /* log the transfer */
+ if (!am_server && log_format)
+ log_send(file, &stats, iflags);
write_int(f_out, i);
+ if (protocol_version >= 29) {
+ write_byte(f_out, iflags);
+ write_byte(f_out, iflags >> 8);
+ }
continue;
}
}
write_int(f_out, i);
+ if (protocol_version >= 29) {
+ write_byte(f_out, iflags);
+ write_byte(f_out, iflags >> 8);
+ }
write_sum_head(f_out, s);
if (verbose > 2) {
safe_fname(fname));
}
- if (!am_server && verbose) /* log the transfer */
+ if (log_before_transfer)
+ log_send(file, &initial_stats, iflags);
+ else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname2));
set_compression(fname);
match_sums(f_out, s, mbuf, st.st_size);
- log_send(file, &initial_stats);
+ if (!log_before_transfer)
+ log_send(file, &initial_stats, iflags);
if (mbuf) {
j = unmap_file(mbuf);