extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
+extern int use_qsort;
extern int xfer_dirs;
extern int filesfrom_fd;
extern int one_file_system;
extern iconv_t ic_send, ic_recv;
#endif
+#define PTR_SIZE (sizeof (struct file_struct *))
+
int io_error;
int checksum_len;
dev_t filesystem_dev; /* used to implement -x */
static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
+static int dir_count = 0;
-static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+static void clean_flist(struct file_list *flist, int strip_root);
static void output_flist(struct file_list *flist);
void init_flist(void)
return 0;
}
-static void send_directory(int f, struct file_list *flist, int ndx,
+static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
static const char *pathname, *orig_dir;
static int pathname_len;
-/**
- * Make sure @p flist is big enough to hold at least @p flist->count
- * entries.
- **/
-void flist_expand(struct file_list *flist)
+/* Make sure flist can hold at least flist->count + extra entries. */
+static void flist_expand(struct file_list *flist, int extra)
{
struct file_struct **new_ptr;
- if (flist->count < flist->malloced)
+ if (flist->count + extra <= flist->malloced)
return;
if (flist->malloced < FLIST_START)
else
flist->malloced *= 2;
- /*
- * In case count jumped or we are starting the list
- * with a known size just set it.
- */
- if (flist->malloced < flist->count)
- flist->malloced = flist->count;
+ /* In case count jumped or we are starting the list
+ * with a known size just set it. */
+ if (flist->malloced < flist->count + extra)
+ flist->malloced = flist->count + extra;
new_ptr = realloc_array(flist->files, struct file_struct *,
flist->malloced);
out_of_memory("flist_expand");
}
+static void flist_done_allocating(struct file_list *flist)
+{
+ void *ptr = pool_boundary(flist->file_pool, 8*1024);
+ if (flist->pool_boundary == ptr)
+ flist->pool_boundary = NULL; /* list didn't use any pool memory */
+ else
+ flist->pool_boundary = ptr;
+}
+
int push_pathname(const char *dir, int len)
{
if (dir == pathname)
} else if (protocol_version < 28)
rdev = MAKEDEV(0, 0);
if (preserve_uid) {
- if (F_UID(file) == uid && *lastname)
+ if ((uid_t)F_OWNER(file) == uid && *lastname)
flags |= XMIT_SAME_UID;
else {
- uid = F_UID(file);
+ uid = F_OWNER(file);
if (preserve_uid && !numeric_ids) {
user_name = add_uid(uid);
if (inc_recurse && user_name)
}
}
if (preserve_gid) {
- if (F_GID(file) == gid && *lastname)
+ if ((gid_t)F_GROUP(file) == gid && *lastname)
flags |= XMIT_SAME_GID;
else {
- gid = F_GID(file);
+ gid = F_GROUP(file);
if (preserve_gid && !numeric_ids) {
group_name = add_gid(gid);
if (inc_recurse && group_name)
}
static struct file_struct *recv_file_entry(struct file_list *flist,
- int flags, int f)
+ int xflags, int f)
{
static int64 modtime;
static mode_t mode;
static uint32 rdev_major;
static uid_t uid;
static gid_t gid;
+ static uint16 gid_flags;
static char lastname[MAXPATHLEN], *lastdir;
static int lastdir_depth, lastdir_len = -1;
static unsigned int del_hier_name_len = 0;
alloc_pool_t *pool;
char *bp;
- if (flags & XMIT_SAME_NAME)
+ if (xflags & XMIT_SAME_NAME)
l1 = read_byte(f);
- if (flags & XMIT_LONG_NAME)
+ if (xflags & XMIT_LONG_NAME)
l2 = read_varint30(f);
else
l2 = read_byte(f);
if (l2 >= MAXPATHLEN - l1) {
rprintf(FERROR,
- "overflow: flags=0x%x l1=%d l2=%d lastname=%s [%s]\n",
- flags, l1, l2, lastname, who_am_i());
+ "overflow: xflags=0x%x l1=%d l2=%d lastname=%s [%s]\n",
+ xflags, l1, l2, lastname, who_am_i());
overflow_exit("recv_file_entry");
}
#ifdef ICONV_OPTION
if (ic_recv != (iconv_t)-1) {
- char *obuf = thisname, *ibuf = lastname;
+ char *obuf = thisname;
+ ICONV_CONST char *ibuf = (ICONV_CONST char *)lastname;
size_t ocnt = MAXPATHLEN, icnt = basename_len;
if (icnt >= MAXPATHLEN) {
#ifdef SUPPORT_HARD_LINKS
if (protocol_version >= 30
- && BITS_SETnUNSET(flags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
+ && BITS_SETnUNSET(xflags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
struct file_struct *first;
first_hlink_ndx = read_varint30(f);
if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) {
modtime = first->modtime;
mode = first->mode;
if (preserve_uid)
- uid = F_UID(first);
+ uid = F_OWNER(first);
if (preserve_gid)
- gid = F_GID(first);
+ gid = F_GROUP(first);
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
uint32 *devp = F_RDEV_P(first);
#endif
file_length = read_varlong30(f, 3);
- if (!(flags & XMIT_SAME_TIME)) {
+ if (!(xflags & XMIT_SAME_TIME)) {
if (protocol_version >= 30) {
modtime = read_varlong(f, 4);
#if SIZEOF_TIME_T < SIZEOF_INT64
} else
modtime = read_int(f);
}
- if (!(flags & XMIT_SAME_MODE))
+ if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
- if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+ if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
uid = (uid_t)read_int(f);
else {
uid = (uid_t)read_varint(f);
- if (flags & XMIT_USER_NAME_FOLLOWS)
+ if (xflags & XMIT_USER_NAME_FOLLOWS)
uid = recv_user_name(f, uid);
else if (inc_recurse && am_root && !numeric_ids)
uid = match_uid(uid);
}
}
- if (preserve_gid && !(flags & XMIT_SAME_GID)) {
+ if (preserve_gid && !(xflags & XMIT_SAME_GID)) {
if (protocol_version < 30)
gid = (gid_t)read_int(f);
else {
gid = (gid_t)read_varint(f);
- if (flags & XMIT_GROUP_NAME_FOLLOWS)
- gid = recv_group_name(f, gid);
+ gid_flags = 0;
+ if (xflags & XMIT_GROUP_NAME_FOLLOWS)
+ gid = recv_group_name(f, gid, &gid_flags);
else if (inc_recurse && (!am_root || !numeric_ids))
- gid = match_gid(gid);
+ gid = match_gid(gid, &gid_flags);
}
}
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
- if (!(flags & XMIT_SAME_RDEV_pre28))
+ if (!(xflags & XMIT_SAME_RDEV_pre28))
rdev = (dev_t)read_int(f);
} else {
uint32 rdev_minor;
- if (!(flags & XMIT_SAME_RDEV_MAJOR))
+ if (!(xflags & XMIT_SAME_RDEV_MAJOR))
rdev_major = read_varint30(f);
if (protocol_version >= 30)
rdev_minor = read_varint(f);
- else if (flags & XMIT_RDEV_MINOR_8_pre30)
+ else if (xflags & XMIT_RDEV_MINOR_8_pre30)
rdev_minor = read_byte(f);
else
rdev_minor = read_int(f);
create_object:
if (preserve_hard_links) {
if (protocol_version < 28 && S_ISREG(mode))
- flags |= XMIT_HLINKED;
- if (flags & XMIT_HLINKED)
+ xflags |= XMIT_HLINKED;
+ if (xflags & XMIT_HLINKED)
extra_len += EXTRA_LEN;
}
#endif
bp += basename_len + linkname_len; /* skip space for symlink too */
#ifdef SUPPORT_HARD_LINKS
- if (flags & XMIT_HLINKED)
+ if (xflags & XMIT_HLINKED)
file->flags |= FLAG_HLINKED;
#endif
file->modtime = (time_t)modtime;
file->mode = mode;
if (preserve_uid)
F_OWNER(file) = uid;
- if (preserve_gid)
+ if (preserve_gid) {
F_GROUP(file) = gid;
+ file->flags |= gid_flags;
+ }
#ifdef ICONV_OPTION
if (ic_ndx)
F_NDX(file) = flist->count + flist->ndx_start;
if (S_ISDIR(mode)) {
if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */
F_DEPTH(file)--;
- if (flags & XMIT_TOP_DIR) {
+ 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
#endif
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && flags & XMIT_HLINKED) {
+ if (preserve_hard_links && xflags & XMIT_HLINKED) {
if (protocol_version >= 30) {
- F_HL_GNUM(file) = flags & XMIT_HLINK_FIRST
+ F_HL_GNUM(file) = xflags & XMIT_HLINK_FIRST
? flist->count : first_hlink_ndx;
} else {
static int32 cnt = 0;
dev = read_int(f);
ino = read_int(f);
} else {
- if (!(flags & XMIT_SAME_DEV_pre30))
+ if (!(xflags & XMIT_SAME_DEV_pre30))
dev = read_longint(f);
ino = read_longint(f);
}
int alloc_len, basename_len, linkname_len;
int extra_len = file_extra_cnt * EXTRA_LEN;
const char *basename;
+ alloc_pool_t *pool;
char *bp;
if (strlcpy(thisname, fname, sizeof thisname)
skip_filters:
/* Only divert a directory in the main transfer. */
- if (flist && flist->prev && S_ISDIR(st.st_mode)
- && flags & FLAG_DIVERT_DIRS) {
- flist = dir_flist;
- /* Room for parent/sibling/next-child info. */
- extra_len += 3 * EXTRA_LEN;
- }
+ if (flist) {
+ if (flist->prev && S_ISDIR(st.st_mode)
+ && flags & FLAG_DIVERT_DIRS) {
+ /* Room for parent/sibling/next-child info. */
+ extra_len += 3 * EXTRA_LEN;
+ dir_count++;
+ pool = dir_flist->file_pool;
+ } else
+ pool = flist->file_pool;
+ } else
+ pool = NULL;
if (verbose > 2) {
rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
alloc_len = FILE_STRUCT_LEN + extra_len + basename_len
+ linkname_len;
- if (flist)
- bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
+ if (pool)
+ bp = pool_alloc(pool, alloc_len, "make_file");
else {
if (!(bp = new_array(char, alloc_len)))
out_of_memory("make_file");
int save_mode = file->mode;
file->mode = S_IFDIR; /* Find a directory with our name. */
if (flist_find(dir_flist, file) >= 0
- && x_stat(thisname, &st2, NULL) == 0 && S_ISDIR(st2.st_mode)) {
+ && x_stat(thisname, &st2, NULL) == 0 && S_ISDIR(st2.st_mode)) {
file->modtime = st2.st_mtime;
file->len32 = 0;
file->mode = st2.st_mode;
if (basename_len == 0+1)
return NULL;
- if (inc_recurse && flist == dir_flist) {
- flist_expand(flist);
- flist->files[flist->count++] = file;
- }
+#ifdef ICONV_OPTION
+ if (ic_ndx)
+ F_NDX(file) = dir_count - 1;
+#endif
return file;
}
maybe_emit_filelist_progress(flist->count + flist_count_offset);
- flist_expand(flist);
+ flist_expand(flist, 1);
flist->files[flist->count++] = file;
if (f >= 0) {
send_file_entry(f, file, flist->count - 1);
return;
}
save_filters = push_local_filters(fbuf, len);
- send_directory(f, flist, -1, fbuf, len, flags);
+ send_directory(f, flist, fbuf, len, flags);
pop_local_filters(save_filters);
fbuf[ol] = '\0';
if (is_dot_dir)
}
}
-static int file_compare(struct file_struct **file1, struct file_struct **file2)
+static int file_compare(const void *file1, const void *file2)
+{
+ return f_name_cmp(*(struct file_struct **)file1,
+ *(struct file_struct **)file2);
+}
+
+/* The guts of a merge-sort algorithm. This was derived from the glibc
+ * version, but I (Wayne) changed the merge code to do less copying and
+ * to require only half the amount of temporary memory. */
+static void fsort_tmp(struct file_struct **fp, size_t num,
+ struct file_struct **tmp)
+{
+ struct file_struct **f1, **f2, **t;
+ size_t n1, n2;
+
+ n1 = num / 2;
+ n2 = num - n1;
+ f1 = fp;
+ f2 = fp + n1;
+
+ if (n1 > 1)
+ fsort_tmp(f1, n1, tmp);
+ if (n2 > 1)
+ fsort_tmp(f2, n2, tmp);
+
+ while (f_name_cmp(*f1, *f2) <= 0) {
+ if (!--n1)
+ return;
+ f1++;
+ }
+
+ t = tmp;
+ memcpy(t, f1, n1 * PTR_SIZE);
+
+ *f1++ = *f2++, n2--;
+
+ while (n1 > 0 && n2 > 0) {
+ if (f_name_cmp(*t, *f2) <= 0)
+ *f1++ = *t++, n1--;
+ else
+ *f1++ = *f2++, n2--;
+ }
+
+ if (n1 > 0)
+ memcpy(f1, t, n1 * PTR_SIZE);
+}
+
+/* This file-struct sorting routine makes sure that any identical names in
+ * the file list stay in the same order as they were in the original list.
+ * This is particularly vital in inc_recurse mode where we expect a sort
+ * on the flist to match the exact order of a sort on the dir_flist. */
+static void fsort(struct file_struct **fp, size_t num)
{
- return f_name_cmp(*file1, *file2);
+ if (num <= 1)
+ return;
+
+ if (use_qsort)
+ qsort(fp, num, PTR_SIZE, file_compare);
+ else {
+ struct file_struct **tmp = new_array(struct file_struct *,
+ (num+1) / 2);
+ fsort_tmp(fp, num, tmp);
+ free(tmp);
+ }
}
-/* We take an entire set of sibling dirs from dir_flist (start <= ndx <= end),
- * sort them by name, and link them into the tree, setting the appropriate
- * parent/child/sibling pointers. */
-static void add_dirs_to_tree(int parent_ndx, int start, int end)
+/* We take an entire set of sibling dirs from the sorted flist and link them
+ * into the tree, setting the appropriate parent/child/sibling pointers. */
+static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
+ int dir_cnt)
{
int i;
int32 *dp = NULL;
int32 *parent_dp = parent_ndx < 0 ? NULL
- : F_DIRNODE_P(dir_flist->files[parent_ndx]);
+ : F_DIRNODE_P(dir_flist->sorted[parent_ndx]);
+
+ flist_expand(dir_flist, dir_cnt);
+ dir_flist->sorted = dir_flist->files;
+
+ for (i = 0; dir_cnt; i++) {
+ struct file_struct *file = from_flist->sorted[i];
- qsort(dir_flist->files + start, end - start + 1,
- sizeof dir_flist->files[0], (int (*)())file_compare);
+ if (!S_ISDIR(file->mode))
+ continue;
+
+ dir_flist->files[dir_flist->count++] = file;
+ dir_cnt--;
- for (i = start; i <= end; i++) {
- struct file_struct *file = dir_flist->files[i];
if (!(file->flags & FLAG_XFER_DIR)
|| file->flags & FLAG_MOUNT_DIR)
continue;
+
if (dp)
- DIR_NEXT_SIBLING(dp) = i;
+ DIR_NEXT_SIBLING(dp) = dir_flist->count - 1;
else if (parent_dp)
- DIR_FIRST_CHILD(parent_dp) = i;
+ DIR_FIRST_CHILD(parent_dp) = dir_flist->count - 1;
else
- send_dir_ndx = i;
+ send_dir_ndx = dir_flist->count - 1;
+
dp = F_DIRNODE_P(file);
DIR_PARENT(dp) = parent_ndx;
DIR_FIRST_CHILD(dp) = -1;
* file list in memory without sending it over the wire. Also, get_dirlist()
* might call this with f set to -2, which also indicates that local filter
* rules should be ignored. */
-static void send_directory(int f, struct file_list *flist, int parent_ndx,
- char *fbuf, int len, int flags)
+static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+ int flags)
{
struct dirent *di;
unsigned remainder;
char *p;
DIR *d;
int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
- int start = divert_dirs ? dir_flist->count : flist->count;
+ int start = flist->count;
int filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
assert(flist != NULL);
closedir(d);
- if (f < 0)
- return;
-
- if (divert_dirs)
- add_dirs_to_tree(parent_ndx, start, dir_flist->count - 1);
- else if (recurse) {
+ if (f >= 0 && recurse && !divert_dirs) {
int i, end = flist->count - 1;
/* send_if_directory() bumps flist->count, so use "end". */
for (i = start; i <= end; i++)
}
}
-void send_extra_file_list(int f, int at_least)
+static void send1extra(int f, struct file_struct *file, struct file_list *flist)
{
char fbuf[MAXPATHLEN];
+ int dlen;
+
+ f_name(file, fbuf);
+ dlen = strlen(fbuf);
+
+ if (F_PATHNAME(file) != pathname) {
+ if (!push_pathname(F_PATHNAME(file), -1))
+ exit_cleanup(RERR_FILESELECT);
+ }
+
+ change_local_filter_dir(fbuf, dlen, send_dir_depth);
+
+ send_directory(f, flist, fbuf, dlen, FLAG_DIVERT_DIRS | FLAG_XFER_DIR);
+}
+
+void send_extra_file_list(int f, int at_least)
+{
struct file_list *flist;
int64 start_write;
int future_cnt, save_io_error = io_error;
} else
future_cnt = 0;
while (future_cnt < at_least) {
- struct file_struct *file = dir_flist->files[send_dir_ndx];
+ struct file_struct *file = dir_flist->sorted[send_dir_ndx];
+ int dir_ndx, dstart = dir_count;
int32 *dp;
- int dlen;
-
- f_name(file, fbuf);
- dlen = strlen(fbuf);
-
- if (F_PATHNAME(file) != pathname) {
- if (!push_pathname(F_PATHNAME(file), -1))
- exit_cleanup(RERR_FILESELECT);
- }
flist = flist_new(0, "send_extra_file_list");
start_write = stats.total_written;
- write_ndx(f, NDX_FLIST_OFFSET - send_dir_ndx);
- change_local_filter_dir(fbuf, dlen, send_dir_depth);
- send_directory(f, flist, send_dir_ndx, fbuf, dlen,
- FLAG_DIVERT_DIRS | FLAG_XFER_DIR);
+#ifdef ICONV_OPTION
+ if (ic_ndx)
+ dir_ndx = F_NDX(file);
+ else
+#endif
+ dir_ndx = send_dir_ndx;
+ write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
+
+ send1extra(f, file, flist);
+ dp = F_DIRNODE_P(file);
+
+ /* If there are any duplicate directory names that follow, we
+ * send all the dirs together in one file-list. The dir_flist
+ * tree links all the child subdirs onto the last dup dir. */
+ while ((dir_ndx = DIR_NEXT_SIBLING(dp)) >= 0
+ && dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) {
+ send_dir_ndx = dir_ndx;
+ file = dir_flist->sorted[dir_ndx];
+ send1extra(f, file, flist);
+ dp = F_DIRNODE_P(file);
+ }
+
write_byte(f, 0);
#ifdef ICONV_OPTION
- if (!need_unsorted_flist)
+ if (need_unsorted_flist) {
+ if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+ out_of_memory("send_extra_file_list");
+ memcpy(flist->sorted, flist->files,
+ flist->count * sizeof (struct file_struct*));
+ } else
#endif
- {
flist->sorted = flist->files;
- clean_flist(flist, 0, 0);
- }
+
+ clean_flist(flist, 0);
+
+ add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart);
+ flist_done_allocating(flist);
+
file_total += flist->count;
future_cnt += flist->count;
stats.flist_size += stats.total_written - start_write;
if (verbose > 3)
output_flist(flist);
- dp = F_DIRNODE_P(file);
if (DIR_FIRST_CHILD(dp) >= 0) {
send_dir_ndx = DIR_FIRST_CHILD(dp);
send_dir_depth++;
goto finish;
}
send_dir_depth--;
- file = dir_flist->files[send_dir_ndx];
+ file = dir_flist->sorted[send_dir_ndx];
dp = F_DIRNODE_P(file);
}
send_dir_ndx = DIR_NEXT_SIBLING(dp);
* because the names will differ on the sending and receiving sides
* (both sides will use the unsorted index number for each item). */
- /* Sort the list without removing any duplicates in non-incremental
- * mode. This allows the receiving side to ask for whatever name it
- * kept. For incremental mode, the sender also removes duplicates
- * in this initial file-list so that it avoids re-sending duplicated
- * directories. */
+ /* Sort the list without removing any duplicates. This allows the
+ * receiving side to ask for whatever name it kept. For incremental
+ * recursion mode, the sender marks duplicate dirs so that it can
+ * send them together in a single file-list. */
#ifdef ICONV_OPTION
if (need_unsorted_flist) {
if (inc_recurse) {
if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
- out_of_memory("recv_file_list");
+ out_of_memory("send_file_list");
memcpy(flist->sorted, flist->files,
flist->count * sizeof (struct file_struct*));
- clean_flist(flist, 0, 1);
- }
+ clean_flist(flist, 0);
+ } else
+ flist->sorted = flist->files;
} else
#endif
{
flist->sorted = flist->files;
- clean_flist(flist, 0, inc_recurse);
+ clean_flist(flist, 0);
}
file_total += flist->count;
if (!numeric_ids && !inc_recurse)
- send_uid_list(f);
+ send_id_list(f);
/* send the io_error flag */
if (protocol_version < 30)
rprintf(FINFO, "send_file_list done\n");
if (inc_recurse) {
- add_dirs_to_tree(-1, 0, dir_flist->count - 1);
+ add_dirs_to_tree(-1, flist, dir_count);
+ flist_done_allocating(flist);
if (send_dir_ndx < 0) {
write_ndx(f, NDX_FLIST_EOF);
flist_eof = 1;
while ((flags = read_byte(f)) != 0) {
struct file_struct *file;
- flist_expand(flist);
+ flist_expand(flist, 1);
if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
flags |= read_byte(f) << 8;
file = recv_file_entry(flist, flags, f);
if (inc_recurse && S_ISDIR(file->mode)) {
- flist_expand(dir_flist);
+ flist_expand(dir_flist, 1);
dir_flist->files[dir_flist->count++] = file;
}
out_of_memory("recv_file_list");
memcpy(flist->sorted, flist->files,
flist->count * sizeof (struct file_struct*));
+ if (inc_recurse && dir_flist->count > dstart) {
+ dir_flist->sorted = realloc_array(dir_flist->sorted,
+ struct file_struct *,
+ dir_flist->count);
+ memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart,
+ (dir_flist->count - dstart) * sizeof (struct file_struct*));
+ fsort(dir_flist->sorted + dstart, dir_flist->count - dstart);
+ }
} else
#endif
+ {
flist->sorted = flist->files;
+ if (inc_recurse && dir_flist->count > dstart) {
+ dir_flist->sorted = dir_flist->files;
+ fsort(dir_flist->sorted + dstart, dir_flist->count - dstart);
+ }
+ }
- clean_flist(flist, relative_paths, 1);
+ if (inc_recurse)
+ flist_done_allocating(flist);
+ else if (f >= 0)
+ recv_id_list(f, flist);
- if (inc_recurse) {
- dir_flist->sorted = dir_flist->files;
- qsort(dir_flist->sorted + dstart, dir_flist->count - dstart,
- sizeof dir_flist->sorted[0], (int (*)())file_compare);
- } else if (f >= 0)
- recv_uid_list(f, flist);
+ clean_flist(flist, relative_paths);
if (protocol_version < 30) {
/* Recv the io_error flag */
if (ndx < 0 || ndx >= dir_flist->count) {
ndx = NDX_FLIST_OFFSET - ndx;
rprintf(FERROR,
- "Invalid dir index: %d (%d - %d)\n",
- ndx, NDX_FLIST_OFFSET,
- NDX_FLIST_OFFSET - dir_flist->count);
+ "[%s] Invalid dir index: %d (%d - %d)\n",
+ who_am_i(), ndx, NDX_FLIST_OFFSET,
+ NDX_FLIST_OFFSET - dir_flist->count + 1);
exit_cleanup(RERR_PROTOCOL);
}
+ if (verbose > 3) {
+ rprintf(FINFO, "[%s] receiving flist for dir %d\n",
+ who_am_i(), ndx);
+ }
flist = recv_file_list(f);
flist->parent_ndx = ndx;
}
memset(flist, 0, sizeof flist[0]);
- if (!(flags & FLIST_TEMP)) {
- if (first_flist) {
- flist->ndx_start = first_flist->prev->ndx_start
- + first_flist->prev->count;
- }
+ if (flags & FLIST_TEMP) {
+ if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0,
+ out_of_memory, POOL_INTERN)))
+ out_of_memory(msg);
+ } else {
/* This is a doubly linked list with prev looping back to
* the end of the list, but the last next pointer is NULL. */
- if (!first_flist)
+ if (!first_flist) {
+ flist->file_pool = pool_create(NORMAL_EXTENT, 0,
+ out_of_memory, POOL_INTERN);
+ if (!flist->file_pool)
+ out_of_memory(msg);
+
first_flist = cur_flist = flist->prev = flist;
- else {
+ } else {
+ flist->file_pool = first_flist->file_pool;
+
+ flist->ndx_start = first_flist->prev->ndx_start
+ + first_flist->prev->count;
+
flist->prev = first_flist->prev;
flist->prev->next = first_flist->prev = flist;
}
+ flist->pool_boundary = pool_boundary(flist->file_pool, 0);
flist_cnt++;
}
- if (!(flist->file_pool = pool_create(FILE_EXTENT, 0, out_of_memory, POOL_INTERN)))
- out_of_memory(msg);
-
return flist;
}
/* Free up all elements in a flist. */
void flist_free(struct file_list *flist)
{
- if (!flist->prev)
- ; /* Was FLIST_TEMP dir-list. */
- else if (flist == flist->prev) {
+ if (!flist->prev) {
+ /* Was FLIST_TEMP dir-list. */
+ } else if (flist == flist->prev) {
first_flist = cur_flist = NULL;
file_total = 0;
flist_cnt = 0;
flist_cnt--;
}
- pool_destroy(flist->file_pool);
+ if (!flist->prev || !flist_cnt)
+ pool_destroy(flist->file_pool);
+ else
+ pool_free_old(flist->file_pool, flist->pool_boundary);
+
if (flist->sorted && flist->sorted != flist->files)
free(flist->sorted);
free(flist->files);
free(flist);
}
-/*
- * This routine ensures we don't have any duplicate names in our file list.
- * duplicate names can cause corruption because of the pipelining
- */
-static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
+/* This routine ensures we don't have any duplicate names in our file list.
+ * duplicate names can cause corruption because of the pipelining. */
+static void clean_flist(struct file_list *flist, int strip_root)
{
char fbuf[MAXPATHLEN];
- int i, prev_i = 0;
+ int i, prev_i;
if (!flist)
return;
return;
}
- qsort(flist->sorted, flist->count,
- sizeof flist->sorted[0], (int (*)())file_compare);
+ fsort(flist->sorted, flist->count);
- for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
- if (F_IS_ACTIVE(flist->sorted[i])) {
- prev_i = i;
- break;
+ if (!am_sender || inc_recurse) {
+ for (i = prev_i = 0; i < flist->count; i++) {
+ if (F_IS_ACTIVE(flist->sorted[i])) {
+ prev_i = i;
+ break;
+ }
}
+ flist->low = prev_i;
+ } else {
+ i = prev_i = flist->count - 1;
+ flist->low = 0;
}
- flist->low = prev_i;
+
while (++i < flist->count) {
int j;
struct file_struct *file = flist->sorted[i];
} else
j = -1;
if (j >= 0) {
- struct file_struct *fp = flist->sorted[j];
int keep, drop;
/* If one is a dir and the other is not, we want to
* keep the dir because it might have contents in the
* list. */
- if (S_ISDIR(file->mode) != S_ISDIR(fp->mode)) {
- if (S_ISDIR(file->mode))
+ if (S_ISDIR(file->mode)) {
+ struct file_struct *fp = flist->sorted[j];
+ if (!S_ISDIR(fp->mode))
keep = i, drop = j;
else
keep = j, drop = i;
- } else if (protocol_version < 27)
+ } else
keep = j, drop = i;
- else
- keep = i, drop = j;
- if (verbose > 1 && !am_server) {
- rprintf(FINFO,
- "removing duplicate name %s from file list (%d)\n",
- f_name(file, fbuf), drop);
- }
- /* 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]);
+ if (am_sender)
+ flist->sorted[drop]->flags |= FLAG_DUPLICATE;
+ else {
+ if (verbose > 1) {
+ rprintf(FINFO,
+ "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]);
+ }
if (keep == i) {
if (flist->low == drop) {
} else
prev_i = i;
}
- flist->high = no_dups ? prev_i : flist->count - 1;
+ flist->high = prev_i;
if (strip_root) {
/* We need to strip off the leading slashes for relative
}
}
- if (prune_empty_dirs && no_dups) {
+ if (prune_empty_dirs && !am_sender) {
int j, prev_depth = 0;
prev_i = 0; /* It's OK that this isn't really true. */
rprintf(FINFO, "[%s] flist start=%d, count=%d, low=%d, high=%d\n",
who, flist->ndx_start, flist->count, flist->low, flist->high);
for (i = 0; i < flist->count; i++) {
- file = flist->files[i];
+ file = flist->sorted[i];
if ((am_root || am_sender) && preserve_uid) {
- snprintf(uidbuf, sizeof uidbuf, " uid=%ld",
- (long)F_UID(file));
+ snprintf(uidbuf, sizeof uidbuf, " uid=%u",
+ F_OWNER(file));
} else
*uidbuf = '\0';
- if (preserve_gid && F_GID(file) != GID_NONE) {
- snprintf(gidbuf, sizeof gidbuf, " gid=%ld",
- (long)F_GID(file));
+ if (preserve_gid) {
+ static char parens[] = "(\0)\0\0\0";
+ char *pp = parens + (file->flags & FLAG_SKIP_GROUP ? 0 : 3);
+ snprintf(gidbuf, sizeof gidbuf, " gid=%s%u%s",
+ pp, F_GROUP(file), pp + 2);
} else
*gidbuf = '\0';
if (!am_sender)
trail = S_ISDIR(file->mode) ? "/" : "";
} else
root = dir = slash = name = trail = "";
- rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
- who, i, root, dir, slash, name, trail, (int)file->mode,
- (double)F_LENGTH(file), uidbuf, gidbuf, file->flags);
+ rprintf(FINFO,
+ "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
+ who, i + flist->ndx_start,
+ root, dir, slash, name, trail,
+ (int)file->mode, (double)F_LENGTH(file),
+ uidbuf, gidbuf, file->flags);
}
}
recurse = 0;
xfer_dirs = 1;
- send_directory(ignore_filter_rules ? -2 : -1, dirlist, -1, dirname, dlen, 0);
+ send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, 0);
xfer_dirs = save_xfer_dirs;
recurse = save_recurse;
if (do_progress)
flist_count_offset += dirlist->count;
dirlist->sorted = dirlist->files;
- clean_flist(dirlist, 0, 0);
+ clean_flist(dirlist, 0);
if (verbose > 3)
output_flist(dirlist);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff