rprintf(FINFO, "skipping directory %s\n", thisname);
return NULL;
}
- } else
- flags &= ~FLAG_XFER_DIR;
-
- /* -x only affects directories because we need to avoid recursing
- * into a mount-point directory, not to avoid copying a symlinked
- * file if -L (or similar) was specified. */
- if (one_file_system && S_ISDIR(st.st_mode)) {
- if (flags & FLAG_TOP_DIR)
- filesystem_dev = st.st_dev;
- else if (st.st_dev != filesystem_dev) {
- if (one_file_system > 1) {
- if (verbose > 2) {
- rprintf(FINFO, "skipping mount-point dir %s\n",
- thisname);
+ /* -x only affects dirs because we need to avoid recursing
+ * into a mount-point directory, not to avoid copying a
+ * symlinked file if -L (or similar) was specified. */
+ if (one_file_system && flags & FLAG_XFER_DIR) {
+ if (flags & FLAG_TOP_DIR)
+ filesystem_dev = st.st_dev;
+ else if (st.st_dev != filesystem_dev) {
+ if (one_file_system > 1) {
+ if (verbose > 2) {
+ rprintf(FINFO,
+ "skipping mount-point dir %s\n",
+ thisname);
+ }
+ return NULL;
}
- return NULL;
+ flags |= FLAG_MOUNT_DIR;
}
- flags |= FLAG_MOUNT_DIR;
}
- }
+ } else
+ flags &= ~FLAG_XFER_DIR;
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
if (ignore_perishable)
if (is_dot_dir) {
STRUCT_STAT st;
- if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+ if (link_stat(fbuf, &st, 1) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
full_fname(fbuf));
{
struct file_list *flist;
int64 start_write;
+ uint16 prev_flags;
int future_cnt, save_io_error = io_error;
if (flist_eof)
flist->parent_ndx = dir_ndx;
send1extra(f, file, flist);
+ prev_flags = file->flags;
dp = F_DIR_NODE_P(file);
/* If there are any duplicate directory names that follow, we
&& dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) {
send_dir_ndx = dir_ndx;
file = dir_flist->sorted[dir_ndx];
- if (F_PATHNAME(file) != pathname)
- send1extra(f, file, flist);
+ /* Try to avoid some duplicate scanning of identical dirs. */
+ if (F_PATHNAME(file) == pathname && prev_flags & FLAG_XFER_DIR)
+ file->flags &= ~FLAG_XFER_DIR;
+ send1extra(f, file, flist);
+ prev_flags = file->flags;
dp = F_DIR_NODE_P(file);
}
if (fn != fbuf)
memmove(fbuf, fn, len + 1);
- if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+ if (link_stat(fbuf, &st, copy_dirlinks || is_dot_dir) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
full_fname(fbuf));
else {
if (am_sender)
file->flags |= FLAG_DUPLICATE;
+ else /* Make sure we don't lose vital flags. */
+ fp->flags |= file->flags & (FLAG_TOP_DIR|FLAG_XFER_DIR);
keep = j, drop = i;
}
} else
"removing duplicate name %s from file list (%d)\n",
f_name(file, fbuf), drop + flist->ndx_start);
}
- /* Make sure we don't lose track of a user-specified
- * top directory. */
- flist->sorted[keep]->flags |= flist->sorted[drop]->flags
- & (FLAG_TOP_DIR|FLAG_XFER_DIR);
-
clear_file(flist->sorted[drop]);
}