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

diff --git a/rsync.c b/rsync.c
index 6c3f8069..7af64e7e 100644
--- a/rsync.c
+++ b/rsync.c
@@ -68,8 +68,8 @@ int delete_file(char *fname)
 	if (!S_ISDIR(st.st_mode)) {
 		if (robust_unlink(fname) == 0 || errno == ENOENT)
 			return 0;
-		rprintf(FERROR, "delete_file: unlink %s failed: %s\n",
-			full_fname(fname), strerror(errno));
+		rsyserr(FERROR, errno, "delete_file: unlink %s failed",
+			full_fname(fname));
 		return -1;
 	}
 
@@ -77,15 +77,15 @@ int delete_file(char *fname)
 		return 0;
 	if (!force_delete || !recurse
 	    || (errno != ENOTEMPTY && errno != EEXIST)) {
-		rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
-			full_fname(fname), strerror(errno));
+		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
+			full_fname(fname));
 		return -1;
 	}
 
 	/* now we do a recsursive delete on the directory ... */
 	if (!(d = opendir(fname))) {
-		rprintf(FERROR, "delete_file: opendir %s failed: %s\n",
-			full_fname(fname), strerror(errno));
+		rsyserr(FERROR, errno, "delete_file: opendir %s failed",
+			full_fname(fname));
 		return -1;
 	}
 
@@ -103,8 +103,8 @@ int delete_file(char *fname)
 		}
 	}
 	if (errno) {
-		rprintf(FERROR, "delete_file: readdir %s failed: %s\n",
-			full_fname(fname), strerror(errno));
+		rsyserr(FERROR, errno, "delete_file: readdir %s failed",
+			full_fname(fname));
 		closedir(d);
 		return -1;
 	}
@@ -112,8 +112,8 @@ int delete_file(char *fname)
 	closedir(d);
 
 	if (do_rmdir(fname) != 0) {
-		rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
-			full_fname(fname), strerror(errno));
+		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
+			full_fname(fname));
 		return -1;
 	}
 
@@ -131,8 +131,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
 	if (!st) {
 		if (link_stat(fname,&st2) != 0) {
-			rprintf(FERROR, "stat %s failed: %s\n",
-				full_fname(fname), strerror(errno));
+			rsyserr(FERROR, errno, "stat %s failed",
+				full_fname(fname));
 			return 0;
 		}
 		st = &st2;
@@ -146,8 +146,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		 * because some filesystems can't do it */
 		if (set_modtime(fname,file->modtime) != 0 &&
 		    !S_ISDIR(st->st_mode)) {
-			rprintf(FERROR, "failed to set times on %s: %s\n",
-				full_fname(fname), strerror(errno));
+			rsyserr(FERROR, errno, "failed to set times on %s",
+				full_fname(fname));
 			return 0;
 		}
 		updated = 1;
@@ -174,9 +174,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		    change_gid ? file->gid : st->st_gid) != 0) {
 			/* shouldn't have attempted to change uid or gid
 			 * unless have the privilege */
-			rprintf(FERROR, "%s %s failed: %s\n",
+			rsyserr(FERROR, errno, "%s %s failed",
 			    change_uid ? "chown" : "chgrp",
-			    full_fname(fname), strerror(errno));
+			    full_fname(fname));
 			return 0;
 		}
 		/* a lchown had been done - we have to re-stat if the
@@ -193,8 +193,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
 			updated = 1;
 			if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) {
-				rprintf(FERROR, "failed to set permissions on %s: %s\n",
-					full_fname(fname), strerror(errno));
+				rsyserr(FERROR, errno, "failed to set permissions on %s",
+					full_fname(fname));
 				return 0;
 			}
 		}
@@ -239,9 +239,9 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 	/* move tmp file over real file */
 	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
 	if (ret < 0) {
-		rprintf(FERROR, "%s %s -> \"%s\": %s\n",
+		rsyserr(FERROR, errno, "%s %s -> \"%s\"",
 		    ret == -2 ? "copy" : "rename",
-		    full_fname(fnametmp), fname, strerror(errno));
+		    full_fname(fnametmp), fname);
 		do_unlink(fnametmp);
 	} else {
 		set_perms(fname, file, NULL,