X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/982e05bbd578c15664a94751ee71e263481143da..d62bcc17f303f30d1e3df1051b1390202a21cf9c:/util.c

diff --git a/util.c b/util.c
index 6fe19fcd..a474c9be 100644
--- a/util.c
+++ b/util.c
@@ -252,29 +252,25 @@ int copy_file(char *source, char *dest, mode_t mode)
 
 	ifd = do_open(source, O_RDONLY, 0);
 	if (ifd == -1) {
-		rprintf(FERROR,"open %s: %s\n",
-			full_fname(source), strerror(errno));
+		rsyserr(FERROR, errno, "open %s", full_fname(source));
 		return -1;
 	}
 
 	if (robust_unlink(dest) && errno != ENOENT) {
-		rprintf(FERROR,"unlink %s: %s\n",
-			full_fname(dest), strerror(errno));
+		rsyserr(FERROR, errno, "unlink %s", full_fname(dest));
 		return -1;
 	}
 
 	ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
 	if (ofd == -1) {
-		rprintf(FERROR,"open %s: %s\n",
-			full_fname(dest), strerror(errno));
+		rsyserr(FERROR, errno, "open %s", full_fname(dest));
 		close(ifd);
 		return -1;
 	}
 
 	while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
 		if (full_write(ofd, buf, len) < 0) {
-			rprintf(FERROR,"write %s: %s\n",
-				full_fname(dest), strerror(errno));
+			rsyserr(FERROR, errno, "write %s", full_fname(dest));
 			close(ifd);
 			close(ofd);
 			return -1;
@@ -282,21 +278,20 @@ int copy_file(char *source, char *dest, mode_t mode)
 	}
 
 	if (len < 0) {
-		rprintf(FERROR, "read %s: %s\n",
-			full_fname(source), strerror(errno));
+		rsyserr(FERROR, errno, "read %s", full_fname(source));
 		close(ifd);
 		close(ofd);
 		return -1;
 	}
 
 	if (close(ifd) < 0) {
-		rprintf(FINFO, "close failed on %s: %s\n",
-			full_fname(source), strerror(errno));
+		rsyserr(FINFO, errno, "close failed on %s",
+			full_fname(source));
 	}
 
 	if (close(ofd) < 0) {
-		rprintf(FERROR, "close failed on %s: %s\n",
-			full_fname(dest), strerror(errno));
+		rsyserr(FERROR, errno, "close failed on %s",
+			full_fname(dest));
 		return -1;
 	}