extern int do_progress;
extern int inplace;
extern struct stats stats;
+extern struct file_list *the_file_list;
extern char *log_format;
return s;
}
-static struct file_list *the_flist;
-
-void successful_send(int i)
+void successful_send(int ndx)
{
char fname[MAXPATHLEN];
struct file_struct *file;
unsigned int offset;
- if (!the_flist || i < 0 || i >= the_flist->count)
+ if (ndx < 0 || ndx >= the_file_list->count)
return;
- file = the_flist->files[i];
+ file = the_file_list->files[ndx];
/* The generator might tell us about symlinks we didn't send. */
if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
return;
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);
write_shortint(f_out, iflags);
if (am_server) {
if (am_daemon && !dry_run && see_item)
- log_send(file, &stats, iflags);
+ log_item(file, &stats, iflags, NULL);
} else if (see_item || iflags & ITEM_UPDATING
|| (S_ISDIR(file->mode)
&& iflags & ITEM_REPORT_TIME))
- log_send(file, &stats, iflags);
+ log_item(file, &stats, iflags, NULL);
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;
+ updating_basis_file = !(iflags & ITEM_USING_ALT_BASIS);
} else
updating_basis_file = inplace && !make_backups;
if (dry_run) { /* log the transfer */
if (!am_server && log_format)
- log_send(file, &stats, iflags);
+ log_item(file, &stats, iflags, NULL);
write_int(f_out, i);
if (protocol_version >= 29)
write_shortint(f_out, iflags);
}
if (log_before_transfer)
- log_send(file, &initial_stats, iflags);
+ log_item(file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname2));
match_sums(f_out, s, mbuf, st.st_size);
if (!log_before_transfer)
- log_send(file, &initial_stats, iflags);
+ log_item(file, &initial_stats, iflags, NULL);
if (mbuf) {
j = unmap_file(mbuf);