#include "io.h"
extern int verbose;
-extern int list_only;
extern int am_root;
extern int am_server;
extern int am_daemon;
/* Nothing yet */
}
-static void list_file_entry(struct file_struct *f)
-{
- char permbuf[PERMSTRING_SIZE];
- double len;
-
- if (!F_IS_ACTIVE(f)) {
- /* this can happen if duplicate names were removed */
- return;
- }
-
- permstring(permbuf, f->mode);
- len = F_LENGTH(f);
-
- /* TODO: indicate '+' if the entry has an ACL. */
-
-#ifdef SUPPORT_LINKS
- if (preserve_links && S_ISLNK(f->mode)) {
- rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
- permbuf, len, timestring(f->modtime),
- f_name(f, NULL), F_SYMLINK(f));
- } else
-#endif
- {
- rprintf(FINFO, "%s %11.0f %s %s\n",
- permbuf, len, timestring(f->modtime),
- f_name(f, NULL));
- }
-}
-
/* Stat either a symlink or its referent, depending on the settings of
* copy_links, copy_unsafe_links, etc. Returns -1 on error, 0 on success.
*
#endif
f_name(file, fname);
- xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
+ /* Initialize starting value of xflags. */
+ if (protocol_version >= 30 && S_ISDIR(file->mode)) {
+ if (file->flags & FLAG_CONTENT_DIR)
+ xflags = file->flags & FLAG_TOP_DIR;
+ else if (file->flags & FLAG_IMPLIED_DIR)
+ xflags = XMIT_TOP_DIR | XMIT_NO_CONTENT_DIR;
+ else
+ xflags = XMIT_NO_CONTENT_DIR;
+ } else
+ xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
if (file->mode == mode)
xflags |= XMIT_SAME_MODE;
else
mode = file->mode;
- if (protocol_version >= 30 && S_ISDIR(mode) && !(file->flags & FLAG_XFER_DIR))
- xflags |= XMIT_NON_XFER_DIR;
-
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
if (S_ISDIR(mode)) {
if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */
F_DEPTH(file)--;
- if (xflags & XMIT_TOP_DIR) {
+ if (protocol_version >= 30) {
+ if (!(xflags & XMIT_NO_CONTENT_DIR)) {
+ if (xflags & XMIT_TOP_DIR)
+ file->flags |= FLAG_TOP_DIR;
+ file->flags |= FLAG_CONTENT_DIR;
+ } else if (xflags & XMIT_TOP_DIR)
+ file->flags |= FLAG_IMPLIED_DIR;
+ } else if (xflags & XMIT_TOP_DIR) {
in_del_hier = recurse;
del_hier_name_len = F_DEPTH(file) == 0 ? 0 : l1 + l2;
if (relative_paths && del_hier_name_len > 2
&& lastname[del_hier_name_len-1] == '.'
&& lastname[del_hier_name_len-2] == '/')
del_hier_name_len -= 2;
- file->flags |= FLAG_TOP_DIR | FLAG_XFER_DIR;
- } else if (protocol_version >= 30) {
- if (!(xflags & XMIT_NON_XFER_DIR))
- file->flags |= FLAG_XFER_DIR;
+ file->flags |= FLAG_TOP_DIR | FLAG_CONTENT_DIR;
} else if (in_del_hier) {
if (!relative_paths || !del_hier_name_len
|| (l1 >= del_hier_name_len
&& lastname[del_hier_name_len] == '/'))
- file->flags |= FLAG_XFER_DIR;
+ file->flags |= FLAG_CONTENT_DIR;
else
in_del_hier = 0;
}
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_CONTENT_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 > 1) {
+ rprintf(FINFO,
+ "[%s] skipping mount-point dir %s\n",
+ who_am_i(), thisname);
+ }
+ return NULL;
}
- return NULL;
+ flags |= FLAG_MOUNT_DIR;
}
- flags |= FLAG_MOUNT_DIR;
}
- }
+ } else
+ flags &= ~FLAG_CONTENT_DIR;
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
if (ignore_perishable)
{
struct file_struct *file;
#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
- statx sx;
+ stat_x sx;
#endif
file = make_file(fname, flist, stp, flags, filter_level);
dir_flist->files[dir_flist->used++] = file;
dir_cnt--;
- if (file->flags & FLAG_MOUNT_DIR)
- continue;
-
if (dp)
DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
else if (parent_dp)
char *start, char *limit, int flags, int is_dot_dir)
{
struct file_struct *file;
- item_list *rel_list;
- char **ep, *slash;
+ item_list *relname_list;
+ relnamecache **rnpp;
+ char *slash;
int len, need_new_dir;
- flags &= ~FLAG_XFER_DIR;
+ flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR);
if (inc_recurse) {
if (lastpath_struct && F_PATHNAME(lastpath_struct) == pathname
int save_copy_links = copy_links;
int save_xfer_dirs = xfer_dirs;
- copy_links |= copy_unsafe_links;
- xfer_dirs = 1;
+ copy_links = xfer_dirs = 1;
*limit = '\0';
if (inc_recurse) {
if (file && !S_ISDIR(file->mode))
file = NULL;
- else if (file)
- memset(F_DIR_RELS_P(file), 0, sizeof (item_list*));
lastpath_struct = file;
}
return; /* dir must have vanished */
len = strlen(limit+1);
- memcpy(&rel_list, F_DIR_RELS_P(lastpath_struct), sizeof rel_list);
- if (!rel_list) {
- if (!(rel_list = new0(item_list)))
+ memcpy(&relname_list, F_DIR_RELNAMES_P(lastpath_struct), sizeof relname_list);
+ if (!relname_list) {
+ if (!(relname_list = new0(item_list)))
out_of_memory("send_implied_dirs");
- memcpy(F_DIR_RELS_P(lastpath_struct), &rel_list, sizeof rel_list);
+ memcpy(F_DIR_RELNAMES_P(lastpath_struct), &relname_list, sizeof relname_list);
}
- ep = EXPAND_ITEM_LIST(rel_list, char *, 32);
- if (!(*ep = new_array(char, 1 + len + 1)))
+ rnpp = EXPAND_ITEM_LIST(relname_list, relnamecache *, 32);
+ if (!(*rnpp = (relnamecache*)new_array(char, sizeof (relnamecache) + len)))
out_of_memory("send_implied_dirs");
- **ep = is_dot_dir;
- strlcpy(*ep + 1, limit+1, len + 1);
+ (*rnpp)->is_dot_dir = is_dot_dir;
+ strlcpy((*rnpp)->fname, limit+1, len + 1);
}
static void send1extra(int f, struct file_struct *file, struct file_list *flist)
{
char fbuf[MAXPATHLEN];
- item_list *rel_list;
- int len, dlen, flags = FLAG_DIVERT_DIRS | FLAG_XFER_DIR;
+ item_list *relname_list;
+ int len, dlen, flags = FLAG_DIVERT_DIRS | FLAG_CONTENT_DIR;
size_t j;
f_name(file, fbuf);
change_local_filter_dir(fbuf, dlen, send_dir_depth);
- if (file->flags & FLAG_XFER_DIR)
+ if (BITS_SETnUNSET(file->flags, FLAG_CONTENT_DIR, FLAG_MOUNT_DIR))
send_directory(f, flist, fbuf, dlen, flags);
if (!relative_paths)
return;
- memcpy(&rel_list, F_DIR_RELS_P(file), sizeof rel_list);
- if (!rel_list)
+ memcpy(&relname_list, F_DIR_RELNAMES_P(file), sizeof relname_list);
+ if (!relname_list)
return;
- for (j = 0; j < rel_list->count; j++) {
- char *slash, *ep = ((char**)rel_list->items)[j];
- int is_dot_dir = *ep;
+ for (j = 0; j < relname_list->count; j++) {
+ char *slash;
+ relnamecache *rnp = ((relnamecache**)relname_list->items)[j];
+ int is_dot_dir = rnp->is_dot_dir;
fbuf[dlen] = '/';
- len = strlcpy(fbuf + dlen + 1, ep+1, sizeof fbuf - dlen - 1);
- free(ep);
+ len = strlcpy(fbuf + dlen + 1, rnp->fname, sizeof fbuf - dlen - 1);
+ free(rnp);
if (len >= (int)sizeof fbuf)
continue; /* Impossible... */
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));
continue;
}
- send_file_name(f, flist, fbuf, &st,
- recurse || xfer_dirs ? FLAG_TOP_DIR | flags : flags,
- ALL_FILTERS);
- } else {
- send_file_name(f, flist, fbuf, NULL,
- recurse ? FLAG_TOP_DIR | flags : flags,
- ALL_FILTERS);
- }
+ send_file_name(f, flist, fbuf, &st, FLAG_TOP_DIR | flags, ALL_FILTERS);
+ } else
+ send_file_name(f, flist, fbuf, NULL, FLAG_TOP_DIR | flags, ALL_FILTERS);
}
- free(rel_list);
+ free(relname_list);
}
void send_extra_file_list(int f, int at_least)
{
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_CONTENT_DIR)
+ file->flags &= ~FLAG_CONTENT_DIR;
+ send1extra(f, file, flist);
+ prev_flags = file->flags;
dp = F_DIR_NODE_P(file);
}
struct timeval start_tv, end_tv;
int64 start_write;
int use_ff_fd = 0;
- int flags, disable_buffering;
+ int disable_buffering;
+ int flags = recurse ? FLAG_CONTENT_DIR : 0;
int reading_remotely = filesfrom_host != NULL;
int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS)
#ifdef ICONV_OPTION
start_write = stats.total_written;
gettimeofday(&start_tv, NULL);
+ if (relative_paths && protocol_version >= 30)
+ implied_dirs = 1; /* We send flagged implied dirs */
+
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && protocol_version >= 30 && !cur_flist)
init_hard_links();
flist = cur_flist = flist_new(0, "send_file_list");
if (inc_recurse) {
dir_flist = flist_new(FLIST_TEMP, "send_file_list");
- flags = FLAG_DIVERT_DIRS | FLAG_XFER_DIR;
- } else {
+ flags |= FLAG_DIVERT_DIRS;
+ } else
dir_flist = cur_flist;
- flags = FLAG_XFER_DIR;
- }
disable_buffering = io_start_buffering_out(f);
if (filesfrom_fd >= 0) {
} else
break;
}
- if (len == 1 && fn[0] == '/')
- fn[len++] = '.';
fn[len] = '\0';
+ if (len == 1) {
+ if (fn[0] == '/') {
+ fn = "/.";
+ len = 2;
+ } else if (fn[0] == '.')
+ is_dot_dir = 1;
+ }
/* Reject a ".." dir in the active part of the path. */
for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) {
if ((p[2] == '/' || p[2] == '\0')
if (!*fn) {
len = 1;
fn = ".";
+ is_dot_dir = 1;
}
dirlen = dir ? strlen(dir) : 0;
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));
if (recurse || (xfer_dirs && is_dot_dir)) {
struct file_struct *file;
- int top_flags = FLAG_TOP_DIR | flags;
+ int top_flags = FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags;
file = send_file_name(f, flist, fbuf, &st,
top_flags, ALL_FILTERS);
if (file && !inc_recurse)
if (verbose > 3)
output_flist(flist);
- if (list_only) {
- int i;
- for (i = flist->low; i <= flist->high; i++)
- list_file_entry(flist->files[i]);
- }
-
if (verbose > 2)
rprintf(FINFO, "recv_file_list done\n");
else {
if (am_sender)
file->flags |= FLAG_DUPLICATE;
+ else { /* Make sure we merge our vital flags. */
+ fp->flags |= file->flags & (FLAG_TOP_DIR|FLAG_CONTENT_DIR);
+ fp->flags &= file->flags | ~FLAG_IMPLIED_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]);
}