#include "rsync.h"
extern int verbose;
-extern int itemize_changes;
+extern int log_before_transfer;
extern int delete_after;
extern int csum_length;
extern struct stats stats;
extern int checksum_seed;
extern int inplace;
extern int delay_updates;
+extern char *log_format;
extern struct filter_list_struct server_filter_list;
int next_gen_i = -1;
int fd1,fd2;
STRUCT_STAT st;
+ int iflags;
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
}
file = flist->files[i];
- if (S_ISDIR(file->mode)) {
- rprintf(FERROR, "[%s] got index of directory: %d\n",
+
+ if (protocol_version >= 29) {
+ iflags = read_byte(f_in);
+ iflags |= read_byte(f_in) << 8;
+ if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
+ if (!dry_run || !am_server)
+ log_recv(file, &stats, iflags);
+ continue;
+ }
+ } else
+ iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
+
+ if (!S_ISREG(file->mode)) {
+ rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
who_am_i(), i);
exit_cleanup(RERR_PROTOCOL);
}
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
if (dry_run) { /* log the transfer */
- if (!am_server && verbose && !itemize_changes)
- rprintf(FINFO, "%s\n", safe_fname(fname));
+ if (!am_server && log_format)
+ log_recv(file, &stats, iflags);
continue;
}
- initial_stats = stats;
-
if (read_batch) {
while (i > next_gen_i) {
if (f_in_name >= 0 && next_gen_i >= 0)
} else
fnamecmp = fname;
+ initial_stats = stats;
+
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
}
/* log the transfer */
- if (!am_server && verbose && !itemize_changes)
+ if (log_before_transfer)
+ log_recv(file, &initial_stats, iflags);
+ else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
fname, fd2, file->length);
- log_recv(file, &initial_stats);
+ if (!log_before_transfer)
+ log_recv(file, &initial_stats, iflags);
if (fd1 != -1)
close(fd1);