X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e9489cd6cb380b30727bd3d074eacc59abca080e..1049378d9c87f69bf9094f19cd2df393e988100c:/backup.c

diff --git a/backup.c b/backup.c
index c3f66ebe..60c85b17 100644
--- a/backup.c
+++ b/backup.c
@@ -20,7 +20,6 @@
 
 #include "rsync.h"
 
-extern int verbose;
 extern int am_root;
 extern int preserve_acls;
 extern int preserve_xattrs;
@@ -62,7 +61,7 @@ static int make_simple_backup(const char *fname)
 
 	while (1) {
 		if (do_rename(fname, fnamebak) == 0) {
-			if (verbose > 1) {
+			if (INFO_GTE(BACKUP, 1)) {
 				rprintf(FINFO, "backed up %s to %s\n",
 					fname, fnamebak);
 			}
@@ -244,13 +243,12 @@ static int keep_backup(const char *fname)
 	/* Check to see if this is a device file, or link */
 	if ((am_root && preserve_devices && IS_DEVICE(file->mode))
 	 || (preserve_specials && IS_SPECIAL(file->mode))) {
-		uint32 *devp = F_RDEV_P(file);
-		dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+		int save_errno;
 		do_unlink(buf);
-		if (do_mknod(buf, file->mode, rdev) < 0) {
-			int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+		if (do_mknod(buf, file->mode, sx.st.st_rdev) < 0) {
+			save_errno = errno ? errno : EINVAL; /* 0 paranoia */
 			if (errno == ENOENT && make_bak_dir(buf) == 0) {
-				if (do_mknod(buf, file->mode, rdev) < 0)
+				if (do_mknod(buf, file->mode, sx.st.st_rdev) < 0)
 					save_errno = errno ? errno : save_errno;
 				else
 					save_errno = 0;
@@ -259,7 +257,9 @@ static int keep_backup(const char *fname)
 				rsyserr(FERROR, save_errno, "mknod %s failed",
 					full_fname(buf));
 			}
-		} else if (verbose > 2) {
+		} else
+			save_errno = 0;
+		if (DEBUG_GTE(BACKUP, 1) && save_errno == 0) {
 			rprintf(FINFO, "make_backup: DEVICE %s successful.\n",
 				fname);
 		}
@@ -284,7 +284,7 @@ static int keep_backup(const char *fname)
 		}
 
 		ret_code = do_rmdir(fname);
-		if (verbose > 2) {
+		if (DEBUG_GTE(BACKUP, 1)) {
 			rprintf(FINFO, "make_backup: RMDIR %s returns %i\n",
 				full_fname(fname), ret_code);
 		}
@@ -295,7 +295,7 @@ static int keep_backup(const char *fname)
 	if (!kept && preserve_links && S_ISLNK(file->mode)) {
 		const char *sl = F_SYMLINK(file);
 		if (safe_symlinks && unsafe_symlink(sl, buf)) {
-			if (verbose) {
+			if (INFO_GTE(SYMSAFE, 1)) {
 				rprintf(FINFO, "ignoring unsafe symlink %s -> %s\n",
 					full_fname(buf), sl);
 			}
@@ -344,7 +344,7 @@ static int keep_backup(const char *fname)
 	preserve_xattrs = save_preserve_xattrs;
 	unmake_file(file);
 
-	if (verbose > 1) {
+	if (INFO_GTE(BACKUP, 1)) {
 		rprintf(FINFO, "backed up %s to %s\n",
 			fname, buf);
 	}