- file = the_file_list->files[ndx];
- if (file->dir.root) {
- offset = stringjoin(fname, sizeof fname,
- file->dir.root, "/", NULL);
- } else
- offset = 0;
- f_name(file, fname + offset);
- if (remove_source_files) {
- if (do_unlink(fname) == 0) {
- if (verbose > 1)
- rprintf(FINFO, "sender removed %s\n", fname + offset);
- } else
- rsyserr(FERROR, errno, "sender failed to remove %s", fname + offset);
+ flist = flist_for_ndx(ndx, "successful_send");
+ file = flist->files[ndx - flist->ndx_start];
+ if (!change_pathname(file, NULL, 0))
+ return;
+ f_name(file, fname);
+
+ if (do_lstat(fname, &st) < 0) {
+ failed_op = "re-lstat";
+ goto failed;
+ }
+
+ if (st.st_size != F_LENGTH(file) || st.st_mtime != file->modtime
+#ifdef ST_MTIME_NSEC
+ || (NSEC_BUMP(file) && (uint32)st.ST_MTIME_NSEC != F_MOD_NSEC(file))
+#endif
+ ) {
+ rprintf(FERROR, "ERROR: Skipping sender remove for changed file: %s\n", fname);
+ return;
+ }
+
+ if (do_unlink(fname) < 0) {
+ failed_op = "remove";
+ failed:
+ if (errno == ENOENT)
+ rprintf(FINFO, "sender file already removed: %s\n", fname);
+ else
+ rsyserr(FERROR, errno, "sender failed to %s %s", failed_op, fname);
+ } else {
+ if (INFO_GTE(REMOVE, 1))
+ rprintf(FINFO, "sender removed %s\n", fname);