#include "rsync.h"
extern int verbose;
-extern int csum_length;
-extern struct stats stats;
-extern int io_error;
extern int dry_run;
extern int am_server;
extern int am_daemon;
+extern int log_before_transfer;
+extern int log_format_has_i;
+extern int daemon_log_format_has_i;
+extern int csum_length;
+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 struct stats stats;
+extern char *log_format;
/**
* and transmits them to the receiver. The sender process runs on the
* machine holding the source files.
**/
-void read_sum_head(int f, struct sum_struct *sum)
-{
- sum->count = read_int(f);
- sum->blength = read_int(f);
- if (protocol_version < 27) {
- sum->s2length = csum_length;
- } else {
- sum->s2length = read_int(f);
- if (sum->s2length > MD4_SUM_LENGTH) {
- rprintf(FERROR, "Invalid checksum length %ld\n",
- (long)sum->s2length);
- exit_cleanup(RERR_PROTOCOL);
- }
- }
- sum->remainder = read_int(f);
-}
/**
* Receive the checksums for a buffer
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 itemizing = am_daemon ? daemon_log_format_has_i
+ : !am_server && log_format_has_i;
+ int i, j;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
}
file = flist->files[i];
-
- stats.current_file_index = i;
- stats.num_transferred_files++;
- stats.total_transferred_size += file->length;
-
- if (file->basedir) {
+ if (file->dir.root) {
/* N.B. We're sure that this fits, so offset is OK. */
- offset = strlcpy(fname, file->basedir, sizeof fname);
+ offset = strlcpy(fname, file->dir.root, sizeof fname);
if (!offset || fname[offset-1] != '/')
fname[offset++] = '/';
} else
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 (protocol_version >= 29) {
+ iflags = read_shortint(f_in);
+ if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
+ int see_item = itemizing && (iflags || verbose > 1);
+ write_int(f_out, i);
+ write_shortint(f_out, iflags);
+ if (am_server) {
+ if (am_daemon && !dry_run && see_item)
+ log_send(file, &stats, iflags);
+ } else if (see_item || iflags & ITEM_UPDATING
+ || (S_ISDIR(file->mode)
+ && iflags & ITEM_REPORT_TIME))
+ 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;
+
+ 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++;
+ stats.total_transferred_size += file->length;
+
+ 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_shortint(f_out, iflags);
continue;
}
}
if (st.st_size) {
- OFF_T map_size = MAX((OFF_T)s->blength * 3, MAX_MAP_SIZE);
- mbuf = map_file(fd, st.st_size, map_size, s->blength);
+ int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE);
+ mbuf = map_file(fd, st.st_size, read_size, s->blength);
} else
mbuf = NULL;
}
write_int(f_out, i);
+ if (protocol_version >= 29)
+ write_shortint(f_out, iflags);
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);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff