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

diff --git a/receiver.c b/receiver.c
index 3c18c4b9..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) {
@@ -479,18 +486,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 	    && flist->count > 0)
 		delete_files(flist);
 
-	if (preserve_hard_links)
-		do_hard_links();
-
-	/* now we need to fix any directory permissions that were
-	 * modified during the transfer */
-	for (i = 0; i < flist->count; i++) {
-		file = flist->files[i];
-		if (!file->basename || !S_ISDIR(file->mode)) continue;
-		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-			       file, i, -1);
-	}
-
 	if (verbose > 2)
 		rprintf(FINFO,"recv_files finished\n");