- Always send/receive the itemized flags for protocols >= 29.
- The output of the verbose log-the-transfer messages is always handled
via log_send() (when we're the client).
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
-extern int itemize_changes;
extern int log_before_transfer;
extern int csum_length;
extern struct stats stats;
extern int log_before_transfer;
extern int csum_length;
extern struct stats stats;
+ if (protocol_version >= 29) {
iflags = read_byte(f_in);
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);
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
log_send(file, &stats, iflags);
continue;
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (dry_run) { /* log the transfer */
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (dry_run) { /* log the transfer */
- if (!am_server && verbose && !log_format)
- rprintf(FINFO, "%s\n", safe_fname(fname2));
- else if (!am_server)
+ if (!am_server && log_format)
log_send(file, &stats, iflags);
write_int(f_out, i);
log_send(file, &stats, iflags);
write_int(f_out, i);
+ if (protocol_version >= 29) {
write_byte(f_out, iflags);
write_byte(f_out, iflags);
+ write_byte(f_out, iflags >> 8);
+ }
+ if (protocol_version >= 29) {
write_byte(f_out, iflags);
write_byte(f_out, iflags);
+ write_byte(f_out, iflags >> 8);
+ }
write_sum_head(f_out, s);
if (verbose > 2) {
write_sum_head(f_out, s);
if (verbose > 2) {
if (log_before_transfer)
log_send(file, &initial_stats, iflags);
if (log_before_transfer)
log_send(file, &initial_stats, iflags);
- else if (!am_server && verbose && (!log_format || do_progress))
+ else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname2));
set_compression(fname);
rprintf(FINFO, "%s\n", safe_fname(fname2));
set_compression(fname);