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

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 6c03f1c..ba1d6ff 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -69,7 +69,7 @@ static struct sum_struct *receive_sums(int f)
 
        s->sums = NULL;
 
-       if (DEBUG_GTE(CHKSUM, 3)) {
+       if (DEBUG_GTE(DELTASUM, 3)) {
                rprintf(FINFO, "count=%s n=%ld rem=%ld\n",
                        big_num(s->count, 0), (long)s->blength, (long)s->remainder);
        }
@@ -103,7 +103,7 @@ static struct sum_struct *receive_sums(int f)
                if (allowed_lull && !(i % lull_mod))
                        maybe_send_keepalive();
 
-               if (DEBUG_GTE(CHKSUM, 3)) {
+               if (DEBUG_GTE(DELTASUM, 3)) {
                        rprintf(FINFO,
                                "chunk[%d] len=%d offset=%s sum1=%08x\n",
                                i, s->sums[i].len, big_num(s->sums[i].offset, 0),
@@ -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);
@@ -323,7 +317,7 @@ void send_files(int f_in, int f_out)
                } else
                        mbuf = NULL;
 
-               if (DEBUG_GTE(CHKSUM, 2)) {
+               if (DEBUG_GTE(DELTASUM, 2)) {
                        rprintf(FINFO, "send_files mapped %s%s%s of size %s\n",
                                path,slash,fname, big_num(st.st_size, 0));
                }
@@ -332,7 +326,7 @@ void send_files(int f_in, int f_out)
                                    fnamecmp_type, xname, xlen);
                write_sum_head(f_xfer, s);
 
-               if (DEBUG_GTE(CHKSUM, 2))
+               if (DEBUG_GTE(DELTASUM, 2))
                        rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname);
 
                if (log_before_transfer)