}
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);
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();
if ((fd1 == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
- snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
- compare_dest,fname);
+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+ compare_dest, fname);
fnamecmp = fnamecmpbuf;
fd1 = do_open(fnamecmp, O_RDONLY, 0);
}
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
* 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) {
&& 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");