extern int filesfrom_fd;
extern int one_file_system;
extern int copy_dirlinks;
-extern int keep_dirlinks;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_acls;
extern int preserve_hard_links;
extern int preserve_devices;
extern int preserve_specials;
+extern int delete_during;
extern int missing_args;
extern int uid_ndx;
extern int gid_ndx;
extern int protocol_version;
extern int sanitize_paths;
extern int munge_symlinks;
+extern int use_safe_inc_flist;
extern int need_unsorted_flist;
extern int sender_symlink_iconv;
extern int output_needs_newline;
filter_list = save_filter_list;
}
+static NORETURN void fatal_unsafe_io_error(void)
+{
+ /* This (sadly) can only happen when pushing data because
+ * the sender does not know about what kind of delete
+ * is in effect on the receiving side when pulling. */
+ rprintf(FERROR_XFER, "FATAL I/O ERROR: dying to avoid a --delete-during issue with a pre-3.0.7 receiver.\n");
+ exit_cleanup(RERR_UNSUPPORTED);
+}
+
static void send1extra(int f, struct file_struct *file, struct file_list *flist)
{
char fbuf[MAXPATHLEN];
dp = F_DIR_NODE_P(file);
}
- if (protocol_version < 31 || io_error == save_io_error || ignore_errors)
+ if (io_error == save_io_error || ignore_errors)
write_byte(f, 0);
- else {
+ else if (use_safe_inc_flist) {
write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST);
write_varint(f, io_error);
+ } else {
+ if (delete_during)
+ fatal_unsafe_io_error();
+ write_byte(f, 0);
}
if (need_unsorted_flist) {
struct timeval start_tv, end_tv;
int64 start_write;
int use_ff_fd = 0;
- int disable_buffering;
+ int disable_buffering, reenable_multiplex = -1;
int flags = recurse ? FLAG_CONTENT_DIR : 0;
int reading_remotely = filesfrom_host != NULL;
int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS)
full_fname(argv[0]));
exit_cleanup(RERR_FILESELECT);
}
+ if (protocol_version < 31) {
+ /* Older protocols send the files-from data w/o packaging
+ * it in multiplexed I/O packets, so temporarily switch
+ * to buffered I/O to match this behavior. */
+ reenable_multiplex = io_end_multiplex_in(MPLX_TO_BUFFERED);
+ }
use_ff_fd = 1;
}
send_file_name(f, flist, fbuf, &st, flags, NO_FILTERS);
}
+ if (reenable_multiplex >= 0)
+ io_start_multiplex_in(reenable_multiplex);
+
gettimeofday(&end_tv, NULL);
stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+ (end_tv.tv_usec - start_tv.tv_usec) / 1000;
start_tv = end_tv;
/* Indicate end of file list */
- if (protocol_version < 31 || io_error == 0 || ignore_errors)
+ if (io_error == 0 || ignore_errors)
write_byte(f, 0);
- else {
+ else if (use_safe_inc_flist) {
write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST);
write_varint(f, io_error);
+ } else {
+ if (delete_during && inc_recurse)
+ fatal_unsafe_io_error();
+ write_byte(f, 0);
}
#ifdef SUPPORT_HARD_LINKS
flist->sorted = flist->files;
flist_sort_and_clean(flist, 0);
file_total += flist->used;
+ file_old_total += flist->used;
if (numeric_ids <= 0 && !inc_recurse)
send_id_list(f);
/* send the io_error flag */
if (protocol_version < 30)
write_int(f, ignore_errors ? 0 : io_error);
- else if (io_error && protocol_version == 30 && !ignore_errors)
+ else if (!use_safe_inc_flist && io_error && !ignore_errors)
send_msg_int(MSG_IO_ERROR, io_error);
if (disable_buffering)
- io_end_buffering_out(True);
+ io_end_buffering_out(IOBUF_FREE_BUFS);
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->used;
if (flags == (XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST)) {
int err;
- if (protocol_version < 31) {
+ if (!use_safe_inc_flist) {
rprintf(FERROR, "Invalid flist flag: %x\n", flags);
exit_cleanup(RERR_PROTOCOL);
}