struct file_list *dirlist;
char delbuf[MAXPATHLEN];
STRUCT_STAT st;
- int dlen, i;
+ int dlen, i, j;
if (!flist) {
while (cur_depth >= min_depth)
if (allowed_lull)
maybe_send_keepalive();
+ if (file->flags & FLAG_MOUNT_POINT)
+ return;
+
if (file->dir.depth >= MAXPATHLEN/2+1)
return; /* Impossible... */
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->count; i--; ) {
- if (!dirlist->files[i]->basename)
+ struct file_struct *fp = dirlist->files[i];
+ if (!fp->basename)
continue;
- if (flist_find(flist, dirlist->files[i]) < 0) {
- int mode = dirlist->files[i]->mode;
- f_name_to(dirlist->files[i], delbuf);
+ if ((j = flist_find(flist, fp)) < 0) {
+ int mode = fp->mode;
+ f_name_to(fp, delbuf);
if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
break;
- }
+ } else if (fp->flags & FLAG_MOUNT_POINT)
+ flist->files[j]->flags |= FLAG_MOUNT_POINT;
}
flist_free(dirlist);
if (max_size && file->length > max_size) {
if (verbose > 1) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
rprintf(FINFO, "%s is over max-size\n",
safe_fname(fname));
}
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
full_fname(fname),
return;
}
- if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_CHECK_MASTER))
return;
if (!S_ISREG(file->mode)) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
rprintf(FINFO, "skipping non-regular file \"%s\"\n",
safe_fname(fname));
return;
if (hard_link_one(file, ndx, fname, -1, &st,
fnamecmpbuf, 1,
itemizing && verbose > 1,
- code) == 0)
+ code) == 0) {
+ if (preserve_hard_links
+ && file->link_u.links) {
+ hard_link_cluster(file, ndx,
+ itemizing,
+ code);
+ }
return;
- if (verbose) {
- rsyserr(FINFO, errno, "link %s => %s",
- full_fname(fnamecmpbuf),
- safe_fname(fname));
}
match_level = 2;
}
}
if (statret != 0) {
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
goto notify_others;
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
statret = real_ret = -1;
goto notify_others;