#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 remove_sent_files;
extern int updating_basis_file;
extern int make_backups;
+extern int do_progress;
extern int inplace;
extern struct stats stats;
+extern char *log_format;
/**
return s;
}
+static struct file_list *the_flist;
+void successful_send(int i)
+{
+ char fname[MAXPATHLEN];
+ struct file_struct *file;
+ unsigned int offset;
+
+ if (!the_flist || i < 0 || i >= the_flist->count)
+ return;
+
+ file = the_flist->files[i];
+ /* The generator might tell us about symlinks we didn't send. */
+ if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
+ return;
+ if (file->dir.root) {
+ offset = stringjoin(fname, sizeof fname,
+ file->dir.root, "/", NULL);
+ } else
+ offset = 0;
+ f_name_to(file, fname + offset);
+ if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) {
+ rprintf(FINFO, "sender removed %s\n",
+ safe_fname(fname + offset));
+ }
+}
void send_files(struct file_list *flist, int f_out, int f_in)
{
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");
+ the_flist = flist;
+
while (1) {
unsigned int offset;
}
if (i < 0 || i >= flist->count) {
+ /* Handle the new keep-alive (no-op) packet. */
+ if (i == flist->count && protocol_version >= 29
+ && read_shortint(f_in) == ITEM_IS_NEW) {
+ write_int(f_out, i);
+ write_shortint(f_out, ITEM_IS_NEW);
+ continue;
+ }
rprintf(FERROR, "Invalid file index %d (count=%d)\n",
i, flist->count);
exit_cleanup(RERR_PROTOCOL);
}
- 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_ISDIR(file->mode)) {
- rprintf(FERROR, "[%s] got index of directory: %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 (file->dir.root) {
/* N.B. We're sure that this fits, so offset is OK. */
offset = strlcpy(fname, file->dir.root, sizeof fname);
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) {
+ updating_basis_file = !(iflags & ITEM_USING_ALT_BASIS);
+ } 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;
}
}
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);
rprintf(FINFO, "sender finished %s\n",
safe_fname(fname));
}
+
+ /* Flag that we actually sent this entry. */
+ file->flags |= FLAG_SENT;
}
make_backups = save_make_backups;