A helper file for cleanup.c.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index baecd5b..6fcaa65 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -34,7 +34,7 @@ extern int append_mode;
 extern int io_error;
 extern int allowed_lull;
 extern int protocol_version;
-extern int remove_sent_files;
+extern int remove_source_files;
 extern int updating_basis_file;
 extern int make_backups;
 extern int do_progress;
@@ -128,17 +128,19 @@ void successful_send(int ndx)
                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)
-               rprintf(FINFO, "sender removed %s\n", 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);
+       }
 }
 
 static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
@@ -281,7 +283,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                stats.total_transferred_size += file->length;
 
                if (!do_xfers) { /* log the transfer */
-                       log_item(FNAME, file, &stats, iflags, NULL);
+                       log_item(FCLIENT, file, &stats, iflags, NULL);
                        write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
                                            xname, xlen);
                        continue;
@@ -342,9 +344,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        rprintf(FINFO, "calling match_sums %s\n", fname);
 
                if (log_before_transfer)
-                       log_item(FNAME, file, &initial_stats, iflags, NULL);
+                       log_item(FCLIENT, file, &initial_stats, iflags, NULL);
                else if (!am_server && verbose && do_progress)
-                       rprintf(FNAME, "%s\n", fname2);
+                       rprintf(FCLIENT, "%s\n", fname2);
 
                set_compression(fname);