Make idev, hlink and file_struct + strings use allocation

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 71897a9..ca6bf23 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -305,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();
 
@@ -411,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
@@ -426,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) {