X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3bb88b4388478e3afdcdcd23df5880132a316d88..1b42f628f495ff0cdaa8a7c219d8ce33192281fe:/flist.c diff --git a/flist.c b/flist.c index 8840eb86..42518d9a 100644 --- a/flist.c +++ b/flist.c @@ -7,8 +7,9 @@ * Copyright (C) 2002-2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,11 +17,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ #include "rsync.h" +#include "ifuncs.h" #include "rounding.h" #include "io.h" @@ -38,6 +39,7 @@ extern int module_id; 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; @@ -49,8 +51,9 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; -extern int preserve_uid; -extern int preserve_gid; +extern int uid_ndx; +extern int gid_ndx; +extern int eol_nulls; extern int relative_paths; extern int implied_dirs; extern int file_extra_cnt; @@ -62,6 +65,7 @@ extern int copy_unsafe_links; extern int protocol_version; extern int sanitize_paths; extern struct stats stats; +extern char *filesfrom_host; extern char curr_dir[MAXPATHLEN]; @@ -70,6 +74,15 @@ extern struct chmod_mode_struct *chmod_modes; extern struct filter_list_struct filter_list; extern struct filter_list_struct server_filter_list; +#ifdef ICONV_OPTION +extern int ic_ndx; +extern int filesfrom_convert; +extern int need_unsorted_flist; +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 */ @@ -80,6 +93,18 @@ 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 */ +/* 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. + * + * Because we use read_longint() to get these off the wire, if you transfer + * devices or (for protocols < 30) hardlinks with dev or inum > 2**32 to a + * machine with no 64-bit types then you will get an overflow error. + * + * Note that if you transfer devices from a 64-bit-devt machine (say, Solaris) + * to a 32-bit-devt machine (say, Linux-2.2/x86) then the device numbers will + * be truncated. But it's a kind of silly thing to do anyhow. */ + /* The tmp_* vars are used as a cache area by make_file() to store data * that the sender doesn't need to remember in its file list. The data * will survive just long enough to be used by send_file_entry(). */ @@ -91,8 +116,10 @@ static char tmp_sum[MAX_DIGEST_LEN]; static char empty_sum[MAX_DIGEST_LEN]; static int flist_count_offset; /* for --delete --progress */ +static int dir_count = 0; +static int high_hlink_ndx; -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) @@ -135,7 +162,7 @@ static void finish_filelist_progress(const struct file_list *flist) if (do_progress) { /* This overwrites the progress line */ rprintf(FINFO, "%d file%sto consider\n", - flist->count, flist->count == 1 ? " " : "s "); + flist->used, flist->used == 1 ? " " : "s "); } else rprintf(FINFO, "done\n"); } @@ -255,22 +282,19 @@ static int is_excluded(char *fname, int is_dir, int filter_level) 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 *flist_dir, *orig_dir; -static int flist_dir_len; +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->used + extra entries. */ +static void flist_expand(struct file_list *flist, int extra) { struct file_struct **new_ptr; - if (flist->count < flist->malloced) + if (flist->used + extra <= flist->malloced) return; if (flist->malloced < FLIST_START) @@ -280,18 +304,16 @@ void flist_expand(struct file_list *flist) 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->used + extra) + flist->malloced = flist->used + extra; new_ptr = realloc_array(flist->files, struct file_struct *, flist->malloced); if (verbose >= 2 && flist->malloced != FLIST_START) { - rprintf(FCLIENT, "[%s] expand file_list to %.0f bytes, did%s move\n", + rprintf(FCLIENT, "[%s] expand file_list pointer array to %.0f bytes, did%s move\n", who_am_i(), (double)sizeof flist->files[0] * flist->malloced, (new_ptr == flist->files) ? " not" : ""); @@ -303,15 +325,24 @@ void flist_expand(struct file_list *flist) out_of_memory("flist_expand"); } -int push_flist_dir(const char *dir, int len) +static void flist_done_allocating(struct file_list *flist) { - if (dir == flist_dir) + 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) return 1; if (!orig_dir) orig_dir = strdup(curr_dir); - if (flist_dir && !pop_dir(orig_dir)) { + if (pathname && !pop_dir(orig_dir)) { rsyserr(FERROR, errno, "pop_dir %s failed", full_fname(orig_dir)); exit_cleanup(RERR_FILESELECT); @@ -324,13 +355,13 @@ int push_flist_dir(const char *dir, int len) return 0; } - flist_dir = dir; - flist_dir_len = len >= 0 ? len : dir ? (int)strlen(dir) : 0; + pathname = dir; + pathname_len = len >= 0 ? len : dir ? (int)strlen(dir) : 0; return 1; } -static void send_file_entry(int f, struct file_struct *file, int ndx) +static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ndx) { static time_t modtime; static mode_t mode; @@ -344,80 +375,112 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) char fname[MAXPATHLEN]; int first_hlink_ndx = -1; int l1, l2; - int flags; + int xflags; + +#ifdef ICONV_OPTION + if (ic_send != (iconv_t)-1) { + xbuf outbuf, inbuf; - f_name(file, fname); + INIT_CONST_XBUF(outbuf, fname); - flags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ + if (file->dirname) { + INIT_XBUF_STRLEN(inbuf, (char*)file->dirname); + outbuf.size -= 2; /* Reserve room for '/' & 1 more char. */ + if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) + goto convert_error; + outbuf.size += 2; + outbuf.buf[outbuf.len++] = '/'; + } + + INIT_XBUF_STRLEN(inbuf, (char*)file->basename); + if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) { + convert_error: + io_error |= IOERR_GENERAL; + rprintf(FINFO, + "[%s] cannot convert filename: %s (%s)\n", + who_am_i(), f_name(file, fname), strerror(errno)); + return; + } + outbuf.buf[outbuf.len] = '\0'; + } else +#endif + f_name(file, fname); + + xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ if (file->mode == mode) - flags |= XMIT_SAME_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 (tmp_rdev == rdev) - flags |= XMIT_SAME_RDEV_pre28; + xflags |= XMIT_SAME_RDEV_pre28; else rdev = tmp_rdev; } else { rdev = tmp_rdev; if ((uint32)major(rdev) == rdev_major) - flags |= XMIT_SAME_RDEV_MAJOR; + xflags |= XMIT_SAME_RDEV_MAJOR; else rdev_major = major(rdev); if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu) - flags |= XMIT_RDEV_MINOR_8_pre30; + xflags |= XMIT_RDEV_MINOR_8_pre30; } } else if (protocol_version < 28) rdev = MAKEDEV(0, 0); - if (preserve_uid) { - if (F_UID(file) == uid && *lastname) - flags |= XMIT_SAME_UID; + if (uid_ndx) { + if ((uid_t)F_OWNER(file) == uid && *lastname) + xflags |= XMIT_SAME_UID; else { - uid = F_UID(file); - if (preserve_uid && !numeric_ids) { + uid = F_OWNER(file); + if (uid_ndx && !numeric_ids) { user_name = add_uid(uid); if (inc_recurse && user_name) - flags |= XMIT_USER_NAME_FOLLOWS; + xflags |= XMIT_USER_NAME_FOLLOWS; } } } - if (preserve_gid) { - if (F_GID(file) == gid && *lastname) - flags |= XMIT_SAME_GID; + if (gid_ndx) { + if ((gid_t)F_GROUP(file) == gid && *lastname) + xflags |= XMIT_SAME_GID; else { - gid = F_GID(file); - if (preserve_gid && !numeric_ids) { + gid = F_GROUP(file); + if (gid_ndx && !numeric_ids) { group_name = add_gid(gid); if (inc_recurse && group_name) - flags |= XMIT_GROUP_NAME_FOLLOWS; + xflags |= XMIT_GROUP_NAME_FOLLOWS; } } } if (file->modtime == modtime) - flags |= XMIT_SAME_TIME; + xflags |= XMIT_SAME_TIME; else modtime = file->modtime; #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { if (protocol_version >= 30) { - struct idev_node *np = idev_node(tmp_dev, tmp_ino); + struct ht_int64_node *np = idev_find(tmp_dev, tmp_ino); first_hlink_ndx = (int32)(long)np->data - 1; if (first_hlink_ndx < 0) { - np->data = (void*)(long)(ndx + 1); - flags |= XMIT_HLINK_FIRST; + high_hlink_ndx = ndx + first_ndx; + np->data = (void*)(long)(high_hlink_ndx + 1); + xflags |= XMIT_HLINK_FIRST; } - flags |= XMIT_HLINKED; + xflags |= XMIT_HLINKED; } else { if (tmp_dev == dev) { if (protocol_version >= 28) - flags |= XMIT_SAME_DEV_pre30; + xflags |= XMIT_SAME_DEV_pre30; } else dev = tmp_dev; - flags |= XMIT_HLINKED; + xflags |= XMIT_HLINKED; } } #endif @@ -428,67 +491,68 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) l2 = strlen(fname+l1); if (l1 > 0) - flags |= XMIT_SAME_NAME; + xflags |= XMIT_SAME_NAME; if (l2 > 255) - flags |= XMIT_LONG_NAME; + xflags |= XMIT_LONG_NAME; /* We must make sure we don't send a zero flag byte or the * other end will terminate the flist transfer. Note that * the use of XMIT_TOP_DIR on a non-dir has no meaning, so * it's harmless way to add a bit to the first flag byte. */ if (protocol_version >= 28) { - if (!flags && !S_ISDIR(mode)) - flags |= XMIT_TOP_DIR; - if ((flags & 0xFF00) || !flags) { - flags |= XMIT_EXTENDED_FLAGS; - write_shortint(f, flags); + if (!xflags && !S_ISDIR(mode)) + xflags |= XMIT_TOP_DIR; + if ((xflags & 0xFF00) || !xflags) { + xflags |= XMIT_EXTENDED_FLAGS; + write_shortint(f, xflags); } else - write_byte(f, flags); + write_byte(f, xflags); } else { - if (!(flags & 0xFF)) - flags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR; - write_byte(f, flags); + if (!(xflags & 0xFF)) + xflags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR; + write_byte(f, xflags); } - if (flags & XMIT_SAME_NAME) + if (xflags & XMIT_SAME_NAME) write_byte(f, l1); - if (flags & XMIT_LONG_NAME) + if (xflags & XMIT_LONG_NAME) write_varint30(f, l2); else write_byte(f, l2); write_buf(f, fname + l1, l2); if (first_hlink_ndx >= 0) { - write_varint30(f, first_hlink_ndx); - goto the_end; + write_varint(f, first_hlink_ndx); + if (first_hlink_ndx >= first_ndx) + goto the_end; } write_varlong30(f, F_LENGTH(file), 3); - if (!(flags & XMIT_SAME_TIME)) { + if (!(xflags & XMIT_SAME_TIME)) { if (protocol_version >= 30) write_varlong(f, modtime, 4); else write_int(f, modtime); } - if (!(flags & XMIT_SAME_MODE)) + if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); - if (preserve_uid && !(flags & XMIT_SAME_UID)) { + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); else { write_varint(f, uid); - if (flags & XMIT_USER_NAME_FOLLOWS) { + if (xflags & XMIT_USER_NAME_FOLLOWS) { int len = strlen(user_name); write_byte(f, len); write_buf(f, user_name, len); } } } - if (preserve_gid && !(flags & XMIT_SAME_GID)) { + if (gid_ndx && !(xflags & XMIT_SAME_GID)) { if (protocol_version < 30) write_int(f, gid); else { write_varint(f, gid); - if (flags & XMIT_GROUP_NAME_FOLLOWS) { + if (xflags & XMIT_GROUP_NAME_FOLLOWS) { int len = strlen(group_name); write_byte(f, len); write_buf(f, group_name, len); @@ -498,14 +562,14 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) 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)) write_int(f, (int)rdev); } else { - if (!(flags & XMIT_SAME_RDEV_MAJOR)) + if (!(xflags & XMIT_SAME_RDEV_MAJOR)) write_varint30(f, major(rdev)); if (protocol_version >= 30) write_varint(f, minor(rdev)); - else if (flags & XMIT_RDEV_MINOR_8_pre30) + else if (xflags & XMIT_RDEV_MINOR_8_pre30) write_byte(f, minor(rdev)); else write_int(f, minor(rdev)); @@ -529,7 +593,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) write_int(f, (int32)tmp_ino); } else { /* 64-bit dev_t and ino_t */ - if (!(flags & XMIT_SAME_DEV_pre30)) + if (!(xflags & XMIT_SAME_DEV_pre30)) write_longint(f, dev); write_longint(f, tmp_ino); } @@ -555,7 +619,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx) } 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; @@ -564,6 +628,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, 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; @@ -575,21 +640,22 @@ static struct file_struct *recv_file_entry(struct file_list *flist, int first_hlink_ndx = -1; OFF_T file_length; const char *basename; - char *bp; struct file_struct *file; + 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"); } @@ -597,7 +663,26 @@ static struct file_struct *recv_file_entry(struct file_list *flist, read_sbuf(f, &thisname[l1], l2); thisname[l1 + l2] = 0; - strlcpy(lastname, thisname, MAXPATHLEN); + /* Abuse basename_len for a moment... */ + basename_len = strlcpy(lastname, thisname, MAXPATHLEN); + +#ifdef ICONV_OPTION + if (ic_recv != (iconv_t)-1) { + xbuf outbuf, inbuf; + + INIT_CONST_XBUF(outbuf, thisname); + INIT_XBUF(inbuf, lastname, basename_len, -1); + + if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) { + io_error |= IOERR_GENERAL; + rprintf(FINFO, + "[%s] cannot convert filename: %s (%s)\n", + who_am_i(), lastname, strerror(errno)); + outbuf.len = 0; + } + outbuf.buf[outbuf.len] = '\0'; + } +#endif clean_fname(thisname, 0); @@ -619,39 +704,40 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #ifdef SUPPORT_HARD_LINKS if (protocol_version >= 30 - && BITS_SETnUNSET(flags, 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) { + && BITS_SETnUNSET(xflags, XMIT_HLINKED, XMIT_HLINK_FIRST)) { + first_hlink_ndx = read_varint(f); + if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->ndx_start + flist->used) { rprintf(FERROR, "hard-link reference out of range: %d (%d)\n", - first_hlink_ndx, flist->count); + first_hlink_ndx, flist->ndx_start + flist->used); exit_cleanup(RERR_PROTOCOL); } - first = flist->files[first_hlink_ndx]; - file_length = F_LENGTH(first); - modtime = first->modtime; - mode = first->mode; - if (preserve_uid) - uid = F_UID(first); - if (preserve_gid) - gid = F_GID(first); - if ((preserve_devices && IS_DEVICE(mode)) - || (preserve_specials && IS_SPECIAL(mode))) { - uint32 *devp = F_RDEV_P(first); - rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); - extra_len += 2 * EXTRA_LEN; - } - if (preserve_links && S_ISLNK(mode)) - linkname_len = strlen(F_SYMLINK(first)) + 1; - else - linkname_len = 0; - goto create_object; + if (first_hlink_ndx >= flist->ndx_start) { + struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start]; + file_length = F_LENGTH(first); + modtime = first->modtime; + mode = first->mode; + if (uid_ndx) + uid = F_OWNER(first); + if (gid_ndx) + gid = F_GROUP(first); + if ((preserve_devices && IS_DEVICE(mode)) + || (preserve_specials && IS_SPECIAL(mode))) { + uint32 *devp = F_RDEV_P(first); + rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); + extra_len += DEV_EXTRA_CNT * EXTRA_LEN; + } + if (preserve_links && S_ISLNK(mode)) + linkname_len = strlen(F_SYMLINK(first)) + 1; + else + linkname_len = 0; + goto create_object; + } } #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 @@ -664,53 +750,54 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } 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 (uid_ndx && !(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 (gid_ndx && !(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); rdev = MAKEDEV(rdev_major, rdev_minor); } - extra_len += 2 * EXTRA_LEN; + extra_len += DEV_EXTRA_CNT * EXTRA_LEN; file_length = 0; } else if (protocol_version < 28) rdev = MAKEDEV(0, 0); @@ -732,9 +819,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, create_object: if (preserve_hard_links) { if (protocol_version < 28 && S_ISREG(mode)) - flags |= XMIT_HLINKED; - if (flags & XMIT_HLINKED) - extra_len += EXTRA_LEN; + xflags |= XMIT_HLINKED; + if (xflags & XMIT_HLINKED) + extra_len += (inc_recurse+1) * EXTRA_LEN; } #endif @@ -758,14 +845,15 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (inc_recurse && S_ISDIR(mode)) { if (one_file_system) { /* Room to save the dir's device for -x */ - extra_len += 2 * EXTRA_LEN; + extra_len += DEV_EXTRA_CNT * EXTRA_LEN; } - flist = dir_flist; - } + pool = dir_flist->file_pool; + } else + pool = flist->file_pool; alloc_len = FILE_STRUCT_LEN + extra_len + basename_len + linkname_len; - bp = pool_alloc(flist->file_pool, alloc_len, "recv_file_entry"); + bp = pool_alloc(pool, alloc_len, "recv_file_entry"); memset(bp, 0, extra_len + FILE_STRUCT_LEN); bp += extra_len; @@ -776,7 +864,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, 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; @@ -786,10 +874,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist, OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); } file->mode = mode; - if (preserve_uid) + if (uid_ndx) F_OWNER(file) = uid; - if (preserve_gid) + if (gid_ndx) { F_GROUP(file) = gid; + file->flags |= gid_flags; + } +#ifdef ICONV_OPTION + if (ic_ndx) + F_NDX(file) = flist->used + flist->ndx_start; +#endif if (basename != thisname) { file->dirname = lastdir; @@ -800,7 +894,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, 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 @@ -808,6 +902,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, && 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; } else if (in_del_hier) { if (!relative_paths || !del_hier_name_len || (l1 >= del_hier_name_len @@ -828,8 +925,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #ifdef SUPPORT_LINKS if (linkname_len) { bp = (char*)file->basename + basename_len; - if (first_hlink_ndx >= 0) { - struct file_struct *first = flist->files[first_hlink_ndx]; + if (first_hlink_ndx >= flist->ndx_start) { + struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start]; memcpy(bp, F_SYMLINK(first), linkname_len); } else read_sbuf(f, bp, linkname_len - 1); @@ -839,24 +936,27 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #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 - ? flist->count : first_hlink_ndx; + if (xflags & XMIT_HLINK_FIRST) { + high_hlink_ndx = flist->ndx_start + flist->used; + F_HL_GNUM(file) = high_hlink_ndx; + } else + F_HL_GNUM(file) = first_hlink_ndx; } else { static int32 cnt = 0; - struct idev_node *np; + struct ht_int64_node *np; int64 ino; int32 ndx; if (protocol_version < 26) { 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); } - np = idev_node(dev, ino); + np = idev_find(dev, ino); ndx = (int32)(long)np->data - 1; if (ndx < 0) { ndx = cnt++; @@ -869,13 +969,13 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) { if (S_ISREG(mode)) - bp = (char*)F_SUM(file); + bp = F_SUM(file); else { /* Prior to 28, we get a useless set of nulls. */ bp = tmp_sum; } - if (first_hlink_ndx >= 0) { - struct file_struct *first = flist->files[first_hlink_ndx]; + if (first_hlink_ndx >= flist->ndx_start) { + struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start]; memcpy(bp, F_SUM(first), checksum_len); } else read_buf(f, bp, checksum_len); @@ -896,37 +996,27 @@ static struct file_struct *recv_file_entry(struct file_list *flist, return file; } -/** - * Create a file_struct for a named file by reading its stat() - * information and performing extensive checks against global - * options. - * - * @return the new file, or NULL if there was an error or this file - * should be excluded. +/* Create a file_struct for a named file by reading its stat() information + * and performing extensive checks against global options. * - * @todo There is a small optimization opportunity here to avoid - * stat()ing the file in some circumstances, which has a certain cost. - * We are called immediately after doing readdir(), and so we may - * already know the d_type of the file. We could for example avoid - * statting directories if we're not recursing, but this is not a very - * important case. Some systems may not have d_type. - **/ + * Returns a pointer to the new file struct, or NULL if there was an error + * or this file should be excluded. */ struct file_struct *make_file(const char *fname, struct file_list *flist, STRUCT_STAT *stp, int flags, int filter_level) { static char *lastdir; static int lastdir_len = -1; struct file_struct *file; - STRUCT_STAT st; char thisname[MAXPATHLEN]; char linkname[MAXPATHLEN]; int alloc_len, basename_len, linkname_len; int extra_len = file_extra_cnt * EXTRA_LEN; const char *basename; + alloc_pool_t *pool; + STRUCT_STAT st; char *bp; - if (strlcpy(thisname, fname, sizeof thisname) - >= sizeof thisname - flist_dir_len) { + if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) { rprintf(FINFO, "skipping overly long name: %s\n", fname); return NULL; } @@ -976,10 +1066,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, if (filter_level == NO_FILTERS) goto skip_filters; - if (S_ISDIR(st.st_mode) && !xfer_dirs) { - rprintf(FINFO, "skipping directory %s\n", thisname); - return NULL; - } + if (S_ISDIR(st.st_mode)) { + if (!xfer_dirs) { + 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 @@ -1013,12 +1106,17 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, 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 += DIRNODE_EXTRA_CNT * 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", @@ -1053,8 +1151,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, 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"); @@ -1095,9 +1193,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); } file->mode = st.st_mode; - if (preserve_uid) + if (uid_ndx) F_OWNER(file) = st.st_uid; - if (preserve_gid) + if (gid_ndx) F_GROUP(file) = st.st_gid; if (basename != thisname) @@ -1113,7 +1211,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, if (always_checksum && am_sender && S_ISREG(st.st_mode)) file_checksum(thisname, tmp_sum, st.st_size); - F_ROOTDIR(file) = flist_dir; + F_PATHNAME(file) = pathname; /* This code is only used by the receiver when it is building * a list of files for a delete pass. */ @@ -1122,13 +1220,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, 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 (preserve_uid) + if (uid_ndx) F_OWNER(file) = st2.st_uid; - if (preserve_gid) + if (gid_ndx) F_GROUP(file) = st2.st_gid; } else file->mode = save_mode; @@ -1137,10 +1235,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, 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; } @@ -1158,14 +1256,14 @@ void unmake_file(struct file_struct *file) static struct file_struct *send_file_name(int f, struct file_list *flist, char *fname, STRUCT_STAT *stp, - int flags, int filter_flags) + int flags, int filter_level) { struct file_struct *file; #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS statx sx; #endif - file = make_file(fname, flist, stp, flags, filter_flags); + file = make_file(fname, flist, stp, flags, filter_level); if (!file) return NULL; @@ -1188,12 +1286,12 @@ static struct file_struct *send_file_name(int f, struct file_list *flist, } #endif - maybe_emit_filelist_progress(flist->count + flist_count_offset); + maybe_emit_filelist_progress(flist->used + flist_count_offset); - flist_expand(flist); - flist->files[flist->count++] = file; + flist_expand(flist, 1); + flist->files[flist->used++] = file; if (f >= 0) { - send_file_entry(f, file, flist->count - 1); + send_file_entry(f, file, flist->used - 1, flist->ndx_start); #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(file->mode)) { send_acl(&sx, f); @@ -1230,7 +1328,7 @@ static void send_if_directory(int f, struct file_list *flist, 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) @@ -1238,36 +1336,106 @@ static void send_if_directory(int f, struct file_list *flist, } } -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(*file1, *file2); + return f_name_cmp(*(struct file_struct **)file1, + *(struct file_struct **)file2); } -/* 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) +/* 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) +{ + 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 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_DIR_NODE_P(dir_flist->sorted[parent_ndx]); - qsort(dir_flist->files + start, end - start + 1, - sizeof dir_flist->files[0], (int (*)())file_compare); + 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]; + + if (!S_ISDIR(file->mode)) + continue; + + dir_flist->files[dir_flist->used++] = 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->used - 1; else if (parent_dp) - DIR_FIRST_CHILD(parent_dp) = i; + DIR_FIRST_CHILD(parent_dp) = dir_flist->used - 1; else - send_dir_ndx = i; - dp = F_DIRNODE_P(file); + send_dir_ndx = dir_flist->used - 1; + + dp = F_DIR_NODE_P(file); DIR_PARENT(dp) = parent_ndx; DIR_FIRST_CHILD(dp) = -1; } @@ -1280,16 +1448,16 @@ static void add_dirs_to_tree(int parent_ndx, int start, int end) * 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 filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS; + int start = flist->used; + int filter_level = f == -2 ? SERVER_FILTERS : ALL_FILTERS; assert(flist != NULL); @@ -1317,8 +1485,15 @@ static void send_directory(int f, struct file_list *flist, int parent_ndx, full_fname(fbuf)); continue; } + if (dname[0] == '\0') { + io_error |= IOERR_GENERAL; + rprintf(FINFO, + "cannot send file with empty name in %s\n", + full_fname(fbuf)); + continue; + } - send_file_name(f, flist, fbuf, NULL, flags, filter_flags); + send_file_name(f, flist, fbuf, NULL, flags, filter_level); } fbuf[len] = '\0'; @@ -1330,22 +1505,34 @@ static void send_directory(int f, struct file_list *flist, int parent_ndx, closedir(d); - if (f < 0) - return; - - if (divert_dirs) - add_dirs_to_tree(parent_ndx, start, dir_flist->count - 1); - else if (recurse) { - int i, end = flist->count - 1; - /* send_if_directory() bumps flist->count, so use "end". */ + if (f >= 0 && recurse && !divert_dirs) { + int i, end = flist->used - 1; + /* send_if_directory() bumps flist->used, so use "end". */ for (i = start; i <= end; i++) send_if_directory(f, flist, flist->files[i], fbuf, len, flags); } } -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; @@ -1357,40 +1544,69 @@ void send_extra_file_list(int f, int at_least) * files in the upcoming file-lists. */ if (cur_flist->next) { flist = first_flist->prev; /* the newest flist */ - future_cnt = flist->count - + flist->ndx_start - cur_flist->next->ndx_start; + future_cnt = flist->ndx_end - cur_flist->next->ndx_start + 1; } 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; + const char *pathname = F_PATHNAME(file); int32 *dp; - int dlen; - - f_name(file, fbuf); - dlen = strlen(fbuf); - - if (F_ROOTDIR(file) != flist_dir) { - if (!push_flist_dir(F_ROOTDIR(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); + flist->parent_ndx = dir_ndx; + + send1extra(f, file, flist); + dp = F_DIR_NODE_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]; + if (F_PATHNAME(file) != pathname) + send1extra(f, file, flist); + dp = F_DIR_NODE_P(file); + } + write_byte(f, 0); - clean_flist(flist, 0, 0); - file_total += flist->count; - future_cnt += flist->count; +#ifdef ICONV_OPTION + if (need_unsorted_flist) { + if (!(flist->sorted = new_array(struct file_struct *, flist->used))) + out_of_memory("send_extra_file_list"); + memcpy(flist->sorted, flist->files, + flist->used * sizeof (struct file_struct*)); + } else +#endif + flist->sorted = flist->files; + + clean_flist(flist, 0); + + flist->ndx_end = flist->ndx_start + flist->used - 1 + - (dir_count - dstart); + + add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart); + flist_done_allocating(flist); + + file_total += flist->used; + future_cnt += flist->used; stats.flist_size += stats.total_written - start_write; - stats.num_files += flist->count; + stats.num_files += flist->used; 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++; @@ -1403,8 +1619,8 @@ void send_extra_file_list(int f, int at_least) goto finish; } send_dir_depth--; - file = dir_flist->files[send_dir_ndx]; - dp = F_DIRNODE_P(file); + file = dir_flist->sorted[send_dir_ndx]; + dp = F_DIR_NODE_P(file); } send_dir_ndx = DIR_NEXT_SIBLING(dp); } @@ -1428,6 +1644,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) int64 start_write; int use_ff_fd = 0; int flags, disable_buffering; + int reading_remotely = filesfrom_host != NULL; + int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS) +#ifdef ICONV_OPTION + | (filesfrom_convert ? RL_CONVERT : 0) +#endif + | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0); rprintf(FLOG, "building file list\n"); if (show_filelist_p()) @@ -1446,10 +1668,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) 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; + flags = FLAG_DIVERT_DIRS | FLAG_XFER_DIR; } else { dir_flist = cur_flist; - flags = 0; + flags = FLAG_XFER_DIR; } disable_buffering = io_start_buffering_out(f); @@ -1468,7 +1690,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) int is_dot_dir; if (use_ff_fd) { - if (read_filesfrom_line(filesfrom_fd, fbuf) == 0) + if (read_line(filesfrom_fd, fbuf, sizeof fbuf, rl_flags) == 0) break; sanitize_path(fbuf, fbuf, "", 0, NULL); } else { @@ -1573,17 +1795,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) dirlen = dir ? strlen(dir) : 0; if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { - if (!push_flist_dir(dir ? strdup(dir) : NULL, dirlen)) - goto push_error; - lastdir = flist_dir; - lastdir_len = flist_dir_len; - } else if (!push_flist_dir(lastdir, lastdir_len)) { - push_error: - io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "push_dir %s failed in %s", - full_fname(dir), curr_dir); + if (!push_pathname(dir ? strdup(dir) : NULL, dirlen)) + continue; + lastdir = pathname; + lastdir_len = pathname_len; + } else if (!push_pathname(lastdir, lastdir_len)) continue; - } if (fn != fbuf) memmove(fbuf, fn, len + 1); @@ -1615,7 +1832,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (fn != p || (*lp && *lp != '/')) { int save_copy_links = copy_links; int save_xfer_dirs = xfer_dirs; - int dir_flags = inc_recurse ? FLAG_DIVERT_DIRS : 0; + int dir_flags = flags & ~FLAG_XFER_DIR; copy_links |= copy_unsafe_links; xfer_dirs = 1; while ((slash = strchr(slash+1, '/')) != 0) { @@ -1637,9 +1854,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (recurse || (xfer_dirs && is_dot_dir)) { struct file_struct *file; - int top_flags = FLAG_TOP_DIR | FLAG_XFER_DIR - | (is_dot_dir ? 0 : flags) - | (inc_recurse ? FLAG_DIVERT_DIRS : 0); + int top_flags = FLAG_TOP_DIR | flags; file = send_file_name(f, flist, fbuf, &st, top_flags, ALL_FILTERS); if (file && !inc_recurse) @@ -1669,16 +1884,41 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) stats.flist_xfertime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000 + (end_tv.tv_usec - start_tv.tv_usec) / 1000; - /* 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. */ - clean_flist(flist, 0, inc_recurse); - file_total += flist->count; + /* When converting names, both sides keep an unsorted file-list array + * 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. 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->used))) + out_of_memory("send_file_list"); + memcpy(flist->sorted, flist->files, + flist->used * sizeof (struct file_struct*)); + clean_flist(flist, 0); + } else { + flist->sorted = flist->files; + flist->low = 0; + flist->high = flist->used - 1; + } + } else +#endif + { + flist->sorted = flist->files; + clean_flist(flist, 0); + } + file_total += flist->used; + + /* We don't subtract dir_count for the first send since we + * might have one or more dot dirs which need to get sent. */ + flist->ndx_end = flist->ndx_start + flist->used - 1; if (!numeric_ids && !inc_recurse) - send_uid_list(f); + send_id_list(f); /* send the io_error flag */ if (protocol_version < 30) @@ -1690,7 +1930,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) io_end_buffering_out(); stats.flist_size = stats.total_written - start_write; - stats.num_files = flist->count; + stats.num_files = flist->used; if (verbose > 3) output_flist(flist); @@ -1699,7 +1939,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) 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; @@ -1730,17 +1971,17 @@ struct file_list *recv_file_list(int f) start_read = stats.total_read; - flist = flist_new(0, "recv_file_list"); - #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && protocol_version < 30) + if (preserve_hard_links && !first_flist) init_hard_links(); #endif + flist = flist_new(0, "recv_file_list"); + if (inc_recurse) { if (flist->ndx_start == 0) dir_flist = flist_new(FLIST_TEMP, "recv_file_list"); - dstart = dir_flist->count; + dstart = dir_flist->used; } else { dir_flist = flist; dstart = 0; @@ -1749,41 +1990,73 @@ struct file_list *recv_file_list(int f) 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); - dir_flist->files[dir_flist->count++] = file; + flist_expand(dir_flist, 1); + dir_flist->files[dir_flist->used++] = file; } - flist->files[flist->count++] = file; + flist->files[flist->used++] = file; - maybe_emit_filelist_progress(flist->count); + maybe_emit_filelist_progress(flist->used); if (verbose > 2) { rprintf(FINFO, "recv_file_name(%s)\n", f_name(file, NULL)); } } - file_total += flist->count; + file_total += flist->used; + + flist->ndx_end = flist->ndx_start + flist->used - 1; + if (inc_recurse && flist->ndx_start) + flist->ndx_end -= dir_flist->used - dstart; if (verbose > 2) - rprintf(FINFO, "received %d names\n", flist->count); + rprintf(FINFO, "received %d names\n", flist->used); if (show_filelist_p()) finish_filelist_progress(flist); - clean_flist(flist, relative_paths, 1); +#ifdef ICONV_OPTION + if (need_unsorted_flist) { + /* Create an extra array of index pointers that we can sort for + * the generator's use (for wading through the files in sorted + * order and for calling flist_find()). We keep the "files" + * list unsorted for our exchange of index numbers with the + * other side (since their names may not sort the same). */ + if (!(flist->sorted = new_array(struct file_struct *, flist->used))) + out_of_memory("recv_file_list"); + memcpy(flist->sorted, flist->files, + flist->used * sizeof (struct file_struct*)); + if (inc_recurse && dir_flist->used > dstart) { + dir_flist->sorted = realloc_array(dir_flist->sorted, + struct file_struct *, + dir_flist->used); + memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart, + (dir_flist->used - dstart) * sizeof (struct file_struct*)); + fsort(dir_flist->sorted + dstart, dir_flist->used - dstart); + } + } else +#endif + { + flist->sorted = flist->files; + if (inc_recurse && dir_flist->used > dstart) { + dir_flist->sorted = dir_flist->files; + fsort(dir_flist->sorted + dstart, dir_flist->used - dstart); + } + } - if (inc_recurse) { - qsort(dir_flist->files + dstart, dir_flist->count - dstart, - sizeof dir_flist->files[0], (int (*)())file_compare); - } else if (f >= 0) - recv_uid_list(f, flist); + if (inc_recurse) + flist_done_allocating(flist); + else if (f >= 0) + recv_id_list(f, flist); + + clean_flist(flist, relative_paths); if (protocol_version < 30) { /* Recv the io_error flag */ @@ -1798,7 +2071,7 @@ struct file_list *recv_file_list(int f) if (list_only) { int i; - for (i = 0; i < flist->count; i++) + for (i = flist->low; i <= flist->high; i++) list_file_entry(flist->files[i]); } @@ -1806,7 +2079,7 @@ struct file_list *recv_file_list(int f) rprintf(FINFO, "recv_file_list done\n"); stats.flist_size += stats.total_read - start_read; - stats.num_files += flist->count; + stats.num_files += flist->used; return flist; } @@ -1822,14 +2095,18 @@ void recv_additional_file_list(int f) change_local_filter_dir(NULL, 0, 0); } else { ndx = NDX_FLIST_OFFSET - ndx; - if (ndx < 0 || ndx >= dir_flist->count) { + if (ndx < 0 || ndx >= dir_flist->used) { 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->used + 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; } @@ -1844,36 +2121,36 @@ int flist_find(struct file_list *flist, struct file_struct *f) while (low <= high) { mid = (low + high) / 2; - if (F_IS_ACTIVE(flist->files[mid])) + if (F_IS_ACTIVE(flist->sorted[mid])) mid_up = mid; else { /* Scan for the next non-empty entry using the cached * distance values. If the value isn't fully up-to- * date, update it. */ - mid_up = mid + F_DEPTH(flist->files[mid]); - if (!F_IS_ACTIVE(flist->files[mid_up])) { + mid_up = mid + F_DEPTH(flist->sorted[mid]); + if (!F_IS_ACTIVE(flist->sorted[mid_up])) { do { - mid_up += F_DEPTH(flist->files[mid_up]); - } while (!F_IS_ACTIVE(flist->files[mid_up])); - F_DEPTH(flist->files[mid]) = mid_up - mid; + mid_up += F_DEPTH(flist->sorted[mid_up]); + } while (!F_IS_ACTIVE(flist->sorted[mid_up])); + F_DEPTH(flist->sorted[mid]) = mid_up - mid; } if (mid_up > high) { /* If there's nothing left above us, set high to * a non-empty entry below us and continue. */ - high = mid - (int)flist->files[mid]->len32; - if (!F_IS_ACTIVE(flist->files[high])) { + high = mid - (int)flist->sorted[mid]->len32; + if (!F_IS_ACTIVE(flist->sorted[high])) { do { - high -= (int)flist->files[high]->len32; - } while (!F_IS_ACTIVE(flist->files[high])); - flist->files[mid]->len32 = mid - high; + high -= (int)flist->sorted[high]->len32; + } while (!F_IS_ACTIVE(flist->sorted[high])); + flist->sorted[mid]->len32 = mid - high; } continue; } } - diff = f_name_cmp(flist->files[mid_up], f); + diff = f_name_cmp(flist->sorted[mid_up], f); if (diff == 0) { if (protocol_version < 29 - && S_ISDIR(flist->files[mid_up]->mode) + && S_ISDIR(flist->sorted[mid_up]->mode) != S_ISDIR(f->mode)) return -1; return mid_up; @@ -1906,40 +2183,47 @@ struct file_list *flist_new(int flags, char *msg) { struct file_list *flist; - flist = new(struct file_list); + flist = new0(struct file_list); if (!flist) out_of_memory(msg); - 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_end + 2; + if (flist->ndx_start <= high_hlink_ndx) + flist->ndx_start = high_hlink_ndx + 1; + 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; @@ -1954,48 +2238,58 @@ void flist_free(struct file_list *flist) flist->next = first_flist; } flist->next->prev = flist->prev; - file_total -= flist->count; + file_total -= flist->used; 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; - if (flist->count == 0) { + if (flist->used == 0) { flist->high = -1; + flist->low = 0; return; } - qsort(flist->files, flist->count, - sizeof flist->files[0], (int (*)())file_compare); + fsort(flist->sorted, flist->used); - for (i = no_dups? 0 : flist->count; i < flist->count; i++) { - if (F_IS_ACTIVE(flist->files[i])) { - prev_i = i; - break; + if (!am_sender || inc_recurse) { + for (i = prev_i = 0; i < flist->used; i++) { + if (F_IS_ACTIVE(flist->sorted[i])) { + prev_i = i; + break; + } } + flist->low = prev_i; + } else { + i = prev_i = flist->used - 1; + flist->low = 0; } - flist->low = prev_i; - while (++i < flist->count) { + + while (++i < flist->used) { int j; - struct file_struct *file = flist->files[i]; + struct file_struct *file = flist->sorted[i]; if (!F_IS_ACTIVE(file)) continue; - if (f_name_cmp(file, flist->files[prev_i]) == 0) + if (f_name_cmp(file, flist->sorted[prev_i]) == 0) j = prev_i; else if (protocol_version >= 29 && S_ISDIR(file->mode)) { int save_mode = file->mode; @@ -2008,36 +2302,40 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } else j = -1; if (j >= 0) { - struct file_struct *fp = flist->files[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)) + * list. Otherwise keep the first one. */ + if (S_ISDIR(file->mode)) { + struct file_struct *fp = flist->sorted[j]; + if (!S_ISDIR(fp->mode) || !(fp->flags & FLAG_XFER_DIR)) keep = i, drop = j; - else + else { + if (am_sender) + file->flags |= FLAG_DUPLICATE; 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->files[keep]->flags |= flist->files[drop]->flags - & (FLAG_TOP_DIR|FLAG_XFER_DIR); - clear_file(flist->files[drop]); + if (!am_sender) { + 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) { for (j = drop + 1; - j < i && !F_IS_ACTIVE(flist->files[j]); + j < i && !F_IS_ACTIVE(flist->sorted[j]); j++) {} flist->low = j; } @@ -2046,13 +2344,13 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } 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 * paths, but this must be done _after_ the sorting phase. */ for (i = flist->low; i <= flist->high; i++) { - struct file_struct *file = flist->files[i]; + struct file_struct *file = flist->sorted[i]; if (!file->dirname) continue; @@ -2063,13 +2361,13 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } } - 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. */ for (i = flist->low; i <= flist->high; i++) { - struct file_struct *fp, *file = flist->files[i]; + struct file_struct *fp, *file = flist->sorted[i]; /* This temporarily abuses the F_DEPTH() value for a * directory that is in a chain that might get pruned. @@ -2077,7 +2375,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) if (S_ISDIR(file->mode) && F_DEPTH(file)) { /* Dump empty dirs when coming back down. */ for (j = prev_depth; j >= F_DEPTH(file); j--) { - fp = flist->files[prev_i]; + fp = flist->sorted[prev_i]; if (F_DEPTH(fp) >= 0) break; prev_i = -F_DEPTH(fp)-1; @@ -2088,7 +2386,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) ALL_FILTERS)) { /* Keep dirs through this dir. */ for (j = prev_depth-1; ; j--) { - fp = flist->files[prev_i]; + fp = flist->sorted[prev_i]; if (F_DEPTH(fp) >= 0) break; prev_i = -F_DEPTH(fp)-1; @@ -2100,7 +2398,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } else { /* Keep dirs through this non-dir. */ for (j = prev_depth; ; j--) { - fp = flist->files[prev_i]; + fp = flist->sorted[prev_i]; if (F_DEPTH(fp) >= 0) break; prev_i = -F_DEPTH(fp)-1; @@ -2110,7 +2408,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } /* Dump all remaining empty dirs. */ while (1) { - struct file_struct *fp = flist->files[prev_i]; + struct file_struct *fp = flist->sorted[prev_i]; if (F_DEPTH(fp) >= 0) break; prev_i = -F_DEPTH(fp)-1; @@ -2118,12 +2416,12 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } for (i = flist->low; i <= flist->high; i++) { - if (F_IS_ACTIVE(flist->files[i])) + if (F_IS_ACTIVE(flist->sorted[i])) break; } flist->low = i; for (i = flist->high; i >= flist->low; i--) { - if (F_IS_ACTIVE(flist->files[i])) + if (F_IS_ACTIVE(flist->sorted[i])) break; } flist->high = i; @@ -2138,24 +2436,26 @@ static void output_flist(struct file_list *flist) const char *who = who_am_i(); int i; - 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]; - if ((am_root || am_sender) && preserve_uid) { - snprintf(uidbuf, sizeof uidbuf, " uid=%ld", - (long)F_UID(file)); + 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]; + if ((am_root || am_sender) && uid_ndx) { + 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 (gid_ndx) { + 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) snprintf(depthbuf, sizeof depthbuf, "%d", F_DEPTH(file)); if (F_IS_ACTIVE(file)) { - root = am_sender ? NS(F_ROOTDIR(file)) : depthbuf; + root = am_sender ? NS(F_PATHNAME(file)) : depthbuf; if ((dir = file->dirname) == NULL) dir = slash = ""; else @@ -2164,15 +2464,20 @@ static void output_flist(struct file_list *flist) 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); } } enum fnc_state { s_DIR, s_SLASH, s_BASE, s_TRAILING }; enum fnc_type { t_PATH, t_ITEM }; +static int found_prefix; + /* Compare the names of two file_struct entities, similar to how strcmp() * would do if it were operating on the joined strings. * @@ -2188,7 +2493,7 @@ enum fnc_type { t_PATH, t_ITEM }; * cannot (and never is in the current codebase). The basename component * may be NULL (for a removed item), in which case it is considered to be * after any existing item. */ -int f_name_cmp(struct file_struct *f1, struct file_struct *f2) +int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2) { int dif; const uchar *c1, *c2; @@ -2293,6 +2598,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) } /* FALL THROUGH */ case s_TRAILING: + found_prefix = 1; if (!*c1) return 0; type2 = t_ITEM; @@ -2306,6 +2612,16 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) return dif; } +/* Returns 1 if f1's filename has all of f2's filename as a prefix. This does + * not match if f2's basename is not an exact match of a path element in f1. + * E.g. /path/foo is not a prefix of /path/foobar/baz, but /path/foobar is. */ +int f_name_has_prefix(const struct file_struct *f1, const struct file_struct *f2) +{ + found_prefix = 0; + f_name_cmp(f1, f2); + return found_prefix; +} + char *f_name_buf(void) { static char names[5][MAXPATHLEN]; @@ -2320,7 +2636,7 @@ char *f_name_buf(void) * buffer or one of 5 static buffers if fbuf is NULL. No size-checking is * done because we checked the size when creating the file_struct entry. */ -char *f_name(struct file_struct *f, char *fbuf) +char *f_name(const struct file_struct *f, char *fbuf) { if (!f || !F_IS_ACTIVE(f)) return NULL; @@ -2350,6 +2666,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) char dirbuf[MAXPATHLEN]; int save_recurse = recurse; int save_xfer_dirs = xfer_dirs; + int save_prune_empty_dirs = prune_empty_dirs; if (dlen < 0) { dlen = strlcpy(dirbuf, dirname, MAXPATHLEN); @@ -2362,13 +2679,16 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) 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; + flist_count_offset += dirlist->used; - clean_flist(dirlist, 0, 0); + prune_empty_dirs = 0; + dirlist->sorted = dirlist->files; + clean_flist(dirlist, 0); + prune_empty_dirs = save_prune_empty_dirs; if (verbose > 3) output_flist(dirlist);