X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c338460d6660c4529c49a68fd2d129c8b4a9d4bb..1a9ec1fd1c144e5f578ee3746bc1ea4a3c73a7cc:/generator.c

diff --git a/generator.c b/generator.c
index de5e2bbc..453c6e07 100644
--- a/generator.c
+++ b/generator.c
@@ -53,7 +53,7 @@ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
 	}
 	if (link_dest) {
 		if (preserve_perms
-		    && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
+		    && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
 			return 0;
 
 		if (am_root && preserve_uid && st->st_uid != file->uid)
@@ -295,7 +295,8 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
 		/* if the file exists already and we aren't perserving
 		 * permissions then act as though the remote end sent
 		 * us the file permissions we already have */
-		file->mode = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
+		file->mode = (file->mode & ~CHMOD_BITS)
+			   | (st.st_mode & CHMOD_BITS);
 	}
 
 	if (S_ISDIR(file->mode)) {
@@ -377,7 +378,7 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
 	if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
 		if (statret != 0 ||
 		    st.st_mode != file->mode ||
-		    (DEV64_T)st.st_rdev != file->u.rdev) {
+		    st.st_rdev != file->u.rdev) {
 			delete_file(fname);
 			if (verbose > 2)
 				rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",