X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/58fef0ac3850006697dca6478d57e75a168b0394..fb72aaba486c6a630011db58cf96063fc1d0f21e:/cleanup.c

diff --git a/cleanup.c b/cleanup.c
index ca7e3546..bb589e48 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -136,10 +136,12 @@ void _exit_cleanup(int code, const char *file, int line)
 	}
 
 	if (code == 0) {
-		if ((io_error & ~IOERR_VANISHED) || log_got_error)
-			code = RERR_PARTIAL;
-		else if (io_error)
+		if (io_error & IOERR_DEL_LIMIT)
+			code = RERR_DEL_LIMIT;
+		if (io_error & IOERR_VANISHED)
 			code = RERR_VANISHED;
+		if (io_error & IOERR_GENERAL || log_got_error)
+			code = RERR_PARTIAL;
 	}
 
 	if (code)
@@ -164,7 +166,7 @@ void cleanup_disable(void)
 void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
 		 int fd_r, int fd_w)
 {
-	cleanup_fname = fnametmp;
+	cleanup_fname = fname ? fnametmp : NULL;
 	cleanup_new_fname = fname;
 	cleanup_file = file;
 	cleanup_fd_r = fd_r;