#include "io.h"
extern int verbose;
-extern int list_only;
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int sanitize_paths;
extern struct stats stats;
extern char *filesfrom_host;
+#ifdef ICONV_OPTION
+extern char *iconv_opt;
+#endif
extern char curr_dir[MAXPATHLEN];
dev_t filesystem_dev; /* used to implement -x */
struct file_list *cur_flist, *first_flist, *dir_flist;
-int send_dir_ndx = -1, send_dir_depth = 0;
+int send_dir_ndx = -1, send_dir_depth = -1;
int flist_cnt = 0; /* how many (non-tmp) file list objects exist */
int file_total = 0; /* total of all active items over all file-lists */
int flist_eof = 0; /* all the file-lists are now known */
+#define NORMAL_NAME 0
+#define SLASH_ENDING_NAME 1
+#define DOT_NAME 2
+
/* Starting from protocol version 26, we always use 64-bit ino_t and dev_t
* internally, even if this platform does not allow files to have 64-bit inums.
* The only exception is if we're on a platform with no 64-bit type at all.
/* 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.
*
{
static time_t modtime;
static mode_t mode;
+#ifdef SUPPORT_HARD_LINKS
static int64 dev;
+#endif
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
#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) {
{
static int64 modtime;
static mode_t mode;
+#ifdef SUPPORT_HARD_LINKS
static int64 dev;
+#endif
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
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) {
+ /* -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 && st.st_dev != filesystem_dev
+ && BITS_SETnUNSET(flags, FLAG_CONTENT_DIR, FLAG_TOP_DIR)) {
if (one_file_system > 1) {
- if (verbose > 2) {
- rprintf(FINFO, "skipping mount-point dir %s\n",
- thisname);
+ if (verbose > 1) {
+ rprintf(FINFO,
+ "[%s] skipping mount-point dir %s\n",
+ who_am_i(), thisname);
}
return NULL;
}
flags |= FLAG_MOUNT_DIR;
+ flags &= ~FLAG_CONTENT_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)
+ if (file->basename[0] == '.' && file->basename[1] == '\0')
continue;
if (dp)
static struct file_struct *lastpath_struct;
static void send_implied_dirs(int f, struct file_list *flist, char *fname,
- char *start, char *limit, int flags, int is_dot_dir)
+ char *start, char *limit, int flags, char name_type)
{
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)->name_type = name_type;
+ 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 (file->flags & FLAG_CONTENT_DIR) {
+ if (one_file_system) {
+ STRUCT_STAT st;
+ if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "link_stat %s failed",
+ full_fname(fbuf));
+ return;
+ }
+ filesystem_dev = st.st_dev;
+ }
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];
+ char name_type = rnp->name_type;
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... */
slash = strchr(fbuf+dlen+1, '/');
if (slash) {
- send_implied_dirs(f, flist, fbuf, fbuf+dlen+1, slash, flags, is_dot_dir);
+ send_implied_dirs(f, flist, fbuf, fbuf+dlen+1, slash, flags, name_type);
continue;
}
- if (is_dot_dir) {
+ if (name_type != NORMAL_NAME) {
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);
}
clean_flist(flist, 0);
- flist->ndx_end = flist->ndx_start + flist->used - 1
- - (dir_count - dstart);
+ flist->ndx_end = flist->ndx_start + flist->used - 1;
+#ifdef ICONV_OPTION
+ if (!iconv_opt)
+#endif
+ flist->ndx_end -= (dir_count - dstart);
add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart);
flist_done_allocating(flist);
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) {
}
while (1) {
- char fbuf[MAXPATHLEN];
- char *fn;
- int is_dot_dir;
+ char fbuf[MAXPATHLEN], *fn, name_type;
if (use_ff_fd) {
if (read_line(filesfrom_fd, fbuf, sizeof fbuf, rl_flags) == 0)
len = strlen(fbuf);
if (relative_paths) {
/* We clean up fbuf below. */
- is_dot_dir = 0;
+ name_type = NORMAL_NAME;
} else if (!len || fbuf[len - 1] == '/') {
if (len == 2 && fbuf[0] == '.') {
/* Turn "./" into just "." rather than "./." */
fbuf[len++] = '.';
fbuf[len] = '\0';
}
- is_dot_dir = 1;
+ name_type = DOT_NAME;
} else if (len > 1 && fbuf[len-1] == '.' && fbuf[len-2] == '.'
&& (len == 2 || fbuf[len-3] == '/')) {
if (len + 2 >= MAXPATHLEN)
fbuf[len++] = '/';
fbuf[len++] = '.';
fbuf[len] = '\0';
- is_dot_dir = 1;
- } else {
- is_dot_dir = fbuf[len-1] == '.'
- && (len == 1 || fbuf[len-2] == '/');
- }
+ name_type = DOT_NAME;
+ } else if (fbuf[len-1] == '.' && (len == 1 || fbuf[len-2] == '/'))
+ name_type = DOT_NAME;
+ else
+ name_type = NORMAL_NAME;
dir = NULL;
dir = "/";
else
dir = fbuf;
- len -= p - fbuf + 3;
fn = p + 3;
+ while (*fn == '/')
+ fn++;
+ if (!*fn)
+ *--fn = '\0'; /* ensure room for '.' */
} else
fn = fbuf;
- /* Get rid of trailing "/" and "/.". */
- while (len) {
- if (fn[len - 1] == '/') {
- is_dot_dir = 1;
- if (!--len && !dir) {
- len++;
- break;
- }
- }
- else if (len >= 2 && fn[len - 1] == '.'
- && fn[len - 2] == '/') {
- is_dot_dir = 1;
- if (!(len -= 2) && !dir) {
- len++;
- break;
- }
- } else
- break;
+ len = clean_fname(fn, CFN_KEEP_LEADING_DOT_DIR
+ | CFN_KEEP_TRAILING_SLASH
+ | CFN_DROP_TRAILING_DOT_DIR);
+ if (len == 1) {
+ if (fn[0] == '/') {
+ fn = "/.";
+ len = 2;
+ name_type = DOT_NAME;
+ } else if (fn[0] == '.')
+ name_type = DOT_NAME;
+ } else if (fn[len-1] == '/') {
+ fn[--len] = '\0';
+ if (len == 1 && *fn == '.')
+ name_type = DOT_NAME;
+ else
+ name_type = SLASH_ENDING_NAME;
}
- if (len == 1 && fn[0] == '/')
- fn[len++] = '.';
- fn[len] = '\0';
/* 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')
&& (p == fn || p[-1] == '/')) {
rprintf(FERROR,
"found \"..\" dir in relative path: %s\n",
- fbuf);
+ fn);
exit_cleanup(RERR_SYNTAX);
}
}
if (!*fn) {
len = 1;
fn = ".";
+ name_type = DOT_NAME;
}
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 || name_type != NORMAL_NAME) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
full_fname(fbuf));
if (inc_recurse && relative_paths && *fbuf) {
if ((p = strchr(fbuf+1, '/')) != NULL) {
- send_implied_dirs(f, flist, fbuf, fbuf, p, flags, is_dot_dir);
- continue;
+ if (p - fbuf == 1 && *fbuf == '.') {
+ if ((fn = strchr(p+1, '/')) != NULL)
+ p = fn;
+ } else
+ fn = p;
+ send_implied_dirs(f, flist, fbuf, fbuf, p, flags, name_type);
+ if (fn == p)
+ continue;
}
} else if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
/* Send the implied directories at the start of the
send_implied_dirs(f, flist, fbuf, slash, p, flags, 0);
}
- if (recurse || (xfer_dirs && is_dot_dir)) {
+ if (one_file_system)
+ filesystem_dev = st.st_dev;
+
+ if (recurse || (xfer_dirs && name_type != NORMAL_NAME)) {
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 (inc_recurse) {
+ if (name_type == DOT_NAME) {
+ if (send_dir_depth < 0) {
+ send_dir_depth = 0;
+ change_local_filter_dir(fbuf, len, send_dir_depth);
+ }
+ send_directory(f, flist, fbuf, len, flags);
+ }
+ } else if (file)
send_if_directory(f, flist, file, fbuf, len, flags);
} else
send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS);
rprintf(FINFO, "send_file_list done\n");
if (inc_recurse) {
+ send_dir_depth = 1;
add_dirs_to_tree(-1, flist, dir_count);
+ if (!file_total || strcmp(flist->sorted[0]->basename, ".") != 0)
+ flist->parent_ndx = -1;
flist_done_allocating(flist);
if (send_dir_ndx < 0) {
write_ndx(f, NDX_FLIST_EOF);
flist = flist_new(0, "recv_file_list");
if (inc_recurse) {
- if (flist->ndx_start == 0)
+ if (flist->ndx_start == 1)
dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
dstart = dir_flist->used;
} else {
file_total += flist->used;
flist->ndx_end = flist->ndx_start + flist->used - 1;
- if (inc_recurse && flist->ndx_start)
+ if (inc_recurse
+#ifdef ICONV_OPTION
+ && !iconv_opt
+#endif
+ && flist->ndx_start > 1)
flist->ndx_end -= dir_flist->used - dstart;
if (verbose > 2)
read_int(f);
else
io_error |= read_int(f);
+ } else if (inc_recurse && flist->ndx_start == 1) {
+ if (!file_total || strcmp(flist->sorted[0]->basename, ".") != 0)
+ flist->parent_ndx = -1;
}
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");
if (!flist->file_pool)
out_of_memory(msg);
+ flist->ndx_start = inc_recurse ? 1 : 0;
+
first_flist = cur_flist = flist->prev = flist;
} else {
flist->file_pool = first_flist->file_pool;
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]);
}
rprintf(FINFO, "[%s] flist start=%d, end=%d, used=%d, low=%d, high=%d\n",
who, flist->ndx_start, flist->ndx_end, flist->used, flist->low, flist->high);
for (i = 0; i < flist->used; i++) {
- file = flist->sorted[i];
+ file = flist->files[i];
if ((am_root || am_sender) && uid_ndx) {
snprintf(uidbuf, sizeof uidbuf, " uid=%u",
F_OWNER(file));