X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d79d1c69f77dd6cc23a4692f6b8bdd82e181194e..7e0ca8e2f0945b8c1b99c88a0283068a3adb19e4:/generator.c

diff --git a/generator.c b/generator.c
index 886c6723..9bf0e959 100644
--- a/generator.c
+++ b/generator.c
@@ -192,7 +192,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 		/* if the file exists already and we aren't perserving
                    presmissions then act as though the remote end sent
                    us the file permissions we already have */
-		file->mode = st.st_mode;
+		file->mode = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
 	}
 
 	if (S_ISDIR(file->mode)) {
@@ -234,7 +234,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 			l = readlink(fname,lnk,MAXPATHLEN-1);
 			if (l > 0) {
 				lnk[l] = 0;
-				if (file->link && strcmp(lnk,file->link) == 0) {
+				if (strcmp(lnk,file->link) == 0) {
 					set_perms(fname,file,&st,1);
 					return;
 				}