#include "rsync.h"
extern int verbose;
-extern int itemize_changes;
+extern int dry_run;
+extern int am_daemon;
+extern int am_server;
+extern int do_progress;
extern int log_before_transfer;
+extern int log_format_has_i;
+extern int daemon_log_format_has_i;
extern int delete_after;
extern int csum_length;
-extern struct stats stats;
-extern int dry_run;
extern int read_batch;
extern int batch_gen_fd;
-extern int am_server;
extern int protocol_version;
extern int relative_paths;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int preserve_perms;
extern int io_error;
-extern char *tmpdir;
-extern char *partial_dir;
-extern char *basis_dir[];
extern int basis_dir_cnt;
extern int make_backups;
-extern int do_progress;
extern int cleanup_got_literal;
+extern int remove_sent_files;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
extern int checksum_seed;
extern int inplace;
extern int delay_updates;
+extern struct stats stats;
extern char *log_format;
+extern char *tmpdir;
+extern char *partial_dir;
+extern char *basis_dir[];
extern struct filter_list_struct server_filter_list;
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
- char *fnamecmp, *partialptr;
+ char *fnamecmp, *partialptr, numbuf[4];
char fnamecmpbuf[MAXPATHLEN];
uchar *delayed_bits = NULL;
struct file_struct *file;
struct stats initial_stats;
int save_make_backups = make_backups;
+ int itemizing = am_daemon ? daemon_log_format_has_i
+ : !am_server && log_format_has_i;
int i, recv_ok, phase = 0;
if (verbose > 2)
}
file = flist->files[i];
+ fname = local_name ? local_name : f_name_to(file, fbuf);
+
+ if (verbose > 2)
+ rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
- if (itemize_changes) {
- iflags = read_byte(f_in);
+ if (protocol_version >= 29) {
+ iflags = read_shortint(f_in);
if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
- if (!dry_run || !am_server)
+ int see_item = itemizing && (iflags || verbose > 1);
+ if (am_server) {
+ if (am_daemon && !dry_run && see_item)
+ log_recv(file, &stats, iflags);
+ } else if (see_item || iflags & ITEM_UPDATING
+ || (S_ISDIR(file->mode)
+ && iflags & ITEM_REPORT_TIME))
log_recv(file, &stats, iflags);
continue;
}
stats.total_transferred_size += file->length;
cleanup_got_literal = 0;
- fname = local_name ? local_name : f_name_to(file, fbuf);
-
if (server_filter_list.head
&& check_filter(&server_filter_list, fname, 0) < 0) {
rprintf(FERROR, "attempt to hack rsync failed.\n");
exit_cleanup(RERR_PROTOCOL);
}
- if (verbose > 2)
- rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
-
if (dry_run) { /* log the transfer */
- if (!am_server && verbose && !log_format)
- rprintf(FINFO, "%s\n", safe_fname(fname));
- else if (!am_server)
+ if (!am_server && log_format)
log_recv(file, &stats, iflags);
continue;
}
/* log the transfer */
if (log_before_transfer)
log_recv(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(fname));
/* recv file data */
cleanup_disable();
- if (!recv_ok) {
+ if (recv_ok) {
+ if (remove_sent_files) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_SUCCESS, numbuf, 4);
+ }
+ } else {
int msgtype = csum_length == SUM_LENGTH || read_batch ?
FERROR : FINFO;
if (msgtype == FERROR || verbose) {
keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
- char buf[4];
- SIVAL(buf, 0, i);
- send_msg(MSG_REDO, buf, 4);
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_REDO, numbuf, 4);
}
}
}