Improved rwrite() to handle a stderr exception without playing games

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 9c550e9..ba1d6ff 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -125,13 +125,7 @@ void successful_send(int ndx)
        if (!remove_source_files)
                return;
 
-       if (!(flist = flist_for_ndx(ndx))) {
-               rprintf(FERROR,
-                       "INTERNAL ERROR: unable to find flist for item %d\n",
-                       ndx);
-               return;
-       }
-
+       flist = flist_for_ndx(ndx, "successful_send");
        file = flist->files[ndx - flist->ndx_start];
        if (!change_pathname(file, NULL, 0))
                return;
@@ -283,7 +277,7 @@ void send_files(int f_in, int f_out)
 
                if (!(s = receive_sums(f_in))) {
                        io_error |= IOERR_GENERAL;
-                       rprintf(FERROR, "receive_sums failed\n");
+                       rprintf(FERROR_XFER, "receive_sums failed\n");
                        exit_cleanup(RERR_PROTOCOL);
                }
 
@@ -311,7 +305,7 @@ void send_files(int f_in, int f_out)
                /* map the local file */
                if (do_fstat(fd, &st) != 0) {
                        io_error |= IOERR_GENERAL;
-                       rsyserr(FERROR, errno, "fstat failed");
+                       rsyserr(FERROR_XFER, errno, "fstat failed");
                        free_sums(s);
                        close(fd);
                        exit_cleanup(RERR_PROTOCOL);