extern int csum_length;
extern int checksum_seed;
extern int protocol_version;
-extern int remove_sent_files;
+extern int remove_sender_files;
extern int preserve_hard_links;
extern char *filesfrom_host;
extern struct stats stats;
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, 4);
- if (remove_sent_files)
+ if (remove_sender_files)
decrement_active_files(IVAL(buf,0));
flist_ndx_push(&redo_list, IVAL(buf,0));
break;
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, len);
- if (remove_sent_files) {
+ if (remove_sender_files) {
decrement_active_files(IVAL(buf,0));
send_msg(MSG_SUCCESS, buf, len);
}
}
/* This is used by the generator to limit how many file transfers can
- * be active at once when --remove-sent-files is specified. Without
+ * be active at once when --remove-sender-files is specified. Without
* this, sender-side deletions were mostly happening at the end. */
void increment_active_files(int ndx, int itemizing, enum logcode code)
{
extern int am_generator;
extern int am_daemon;
extern int blocking_io;
-extern int remove_sent_files;
+extern int remove_sender_files;
extern int daemon_over_rsh;
extern int need_messages_from_generator;
extern int kluge_around_eof;
exit_cleanup(RERR_SYNTAX);
return;
}
- if (am_daemon && lp_read_only(module_id) && remove_sent_files) {
+ if (am_daemon && lp_read_only(module_id) && remove_sender_files) {
rprintf(FERROR,
- "ERROR: --remove-sent-files cannot be used with a read-only module\n");
+ "ERROR: --remove-%s-files cannot be used with a read-only module\n",
+ remove_sender_files == 1 ? "sender" : "sent");
exit_cleanup(RERR_SYNTAX);
return;
}
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
-extern int remove_sent_files;
+extern int remove_sender_files;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
} else {
- if (remove_sent_files
+ if (remove_sender_files
|| (preserve_hard_links
&& file->link_u.links)) {
SIVAL(numbuf, 0, i);
cleanup_disable();
if (recv_ok > 0) {
- if (remove_sent_files
+ if (remove_sender_files
|| (preserve_hard_links && file->link_u.links)) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4);
extern int io_error;
extern int allowed_lull;
extern int protocol_version;
-extern int remove_sent_files;
+extern int remove_sender_files;
extern int updating_basis_file;
extern int make_backups;
extern int do_progress;
return;
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 (file->dir.root) {
offset = stringjoin(fname, sizeof fname,
file->dir.root, "/", NULL);
} else
offset = 0;
f_name(file, fname + offset);
- if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1)
+ if (remove_sender_files && do_unlink(fname) == 0 && verbose > 1)
rprintf(FINFO, "sender removed %s\n", fname + offset);
}