X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e327acece45bfb1c17ad6c41e8e4b6d388aa6287..16417f8b9d1947f4efbe540ee6983feba2ebc21c:/rsync.c

diff --git a/rsync.c b/rsync.c
index 5ee50c08..d6c4ac41 100644
--- a/rsync.c
+++ b/rsync.c
@@ -91,7 +91,7 @@ int delete_file(char *fname)
 		if (strcmp(dname,".")==0 ||
 		    strcmp(dname,"..")==0)
 			continue;
-		slprintf(buf, sizeof(buf), "%s/%s", fname, dname);
+		snprintf(buf, sizeof(buf), "%s/%s", fname, dname);
 		if (verbose > 0)
 			rprintf(FINFO,"deleting %s\n", buf);
 		if (delete_file(buf) != 0) {
@@ -203,9 +203,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
 #ifdef HAVE_CHMOD
 	if (!S_ISLNK(st->st_mode)) {
-		if (st->st_mode != file->mode) {
+		if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
 			updated = 1;
-			if (do_chmod(fname,file->mode) != 0) {
+			if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) {
 				rprintf(FERROR,"failed to set permissions on %s : %s\n",
 					fname,strerror(errno));
 				return 0;