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

diff --git a/receiver.c b/receiver.c
index 71897a94..75bf0cea 100644
--- a/receiver.c
+++ b/receiver.c
@@ -305,6 +305,11 @@ 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();
 
@@ -356,7 +361,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 		/* open the file */
 		fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
-		if ((fd1 == -1) && (compare_dest != NULL)) {
+		if (fd1 == -1 && compare_dest != NULL) {
 			/* try the file at compare_dest instead */
 			pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
 				 compare_dest, fname);
@@ -411,7 +416,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
@@ -426,7 +431,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) {