X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f83f054875254ab48afaddcd8c985205ef9416e1..4c3b4b25573f0eed181107097c040afc3e0ac4e1:/generator.c

diff --git a/generator.c b/generator.c
index 1be47176..d77e7b56 100644
--- a/generator.c
+++ b/generator.c
@@ -182,7 +182,7 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 	if (S_ISDIR(file->mode)) {
 		if (dry_run) return;
 		if (statret == 0 && !S_ISDIR(st.st_mode)) {
-			if (do_unlink(fname) != 0) {
+			if (robust_unlink(fname) != 0) {
 				rprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
 				return;
 			}
@@ -317,7 +317,8 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 	}
 
 	if (skip_file(fname, file, &st)) {
-		set_perms(fname,file,&st,1);
+		if (fnamecmp == fname)
+			set_perms(fname,file,&st,1);
 		return;
 	}