X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f746dda0a0022427eb1ef374f8f998b2153e50e5..7cf8e8d05da57806a784d8d26932731fd5b9d195:/receiver.c

diff --git a/receiver.c b/receiver.c
index b3e2f23e..ca6bf23f 100644
--- a/receiver.c
+++ b/receiver.c
@@ -91,8 +91,9 @@ void delete_files(struct file_list *flist)
 	}
 
 	for (j = 0;j < flist->count; j++) {
-		if (!S_ISDIR(flist->files[j]->mode) ||
-		    !(flist->files[j]->flags & FLAG_DELETE)) continue;
+		if (!(flist->files[j]->flags & FLAG_TOP_DIR)
+		    || !S_ISDIR(flist->files[j]->mode))
+			continue;
 
 		argv[0] = f_name_to(flist->files[j], fbuf);
 
@@ -304,6 +305,12 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 		rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
 	}
 
+	if (flist->hlink_pool)
+	{
+		pool_destroy(flist->hlink_pool);
+		flist->hlink_pool = NULL;
+	}
+
 	while (1) {
 		cleanup_disable();
 
@@ -410,7 +417,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 			continue;
 		}
 
-		strlcpy(template, fnametmp, sizeof(template));
+		strlcpy(template, fnametmp, sizeof template);
 
 		/* we initially set the perms without the
 		 * setuid/setgid bits to ensure that there is no race
@@ -425,7 +432,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 		 * transferred, but that may not be the case with -R */
 		if (fd2 == -1 && relative_paths && errno == ENOENT &&
 		    create_directory_path(fnametmp, orig_umask) == 0) {
-			strlcpy(fnametmp, template, sizeof(fnametmp));
+			strlcpy(fnametmp, template, sizeof fnametmp);
 			fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
 		}
 		if (fd2 == -1) {