X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5303941021034f9b6272d5c1512096e125aece1e..1b42f628f495ff0cdaa8a7c219d8ce33192281fe:/flist.c diff --git a/flist.c b/flist.c index a61eaef7..42518d9a 100644 --- a/flist.c +++ b/flist.c @@ -4,11 +4,11 @@ * Copyright (C) 1996 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison + * 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 as published by - * the Free Software Foundation; either version 2 of the License, or + * 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, @@ -17,11 +17,13 @@ * 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" extern int verbose; extern int list_only; @@ -29,25 +31,32 @@ extern int am_root; extern int am_server; extern int am_daemon; extern int am_sender; +extern int am_generator; +extern int inc_recurse; extern int do_progress; extern int always_checksum; 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; extern int copy_dirlinks; extern int keep_dirlinks; +extern int preserve_acls; +extern int preserve_xattrs; 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; extern int ignore_perishable; extern int non_perishable_cnt; extern int prune_empty_dirs; @@ -56,7 +65,7 @@ extern int copy_unsafe_links; extern int protocol_version; extern int sanitize_paths; extern struct stats stats; -extern struct file_list *the_file_list; +extern char *filesfrom_host; extern char curr_dir[MAXPATHLEN]; @@ -65,29 +74,68 @@ 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 */ -unsigned int file_struct_len; -static char empty_sum[MD4_SUM_LENGTH]; -static int flist_count_offset; +struct file_list *cur_flist, *first_flist, *dir_flist; +int send_dir_ndx = -1, send_dir_depth = 0; +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(). */ +static dev_t tmp_rdev; +#ifdef SUPPORT_HARD_LINKS +static int64 tmp_dev, tmp_ino; +#endif +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) { - struct file_struct f; - - /* Figure out how big the file_struct is without trailing padding */ - file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags; - checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH; + if (verbose > 4) { + rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n", + (int)FILE_STRUCT_LEN, (int)EXTRA_LEN); + } + checksum_len = protocol_version < 21 ? 2 + : protocol_version < 30 ? MD4_DIGEST_LEN + : MD5_DIGEST_LEN; } static int show_filelist_p(void) { - return verbose && xfer_dirs && !am_server; + return verbose && xfer_dirs && !am_server && !inc_recurse; } static void start_filelist_progress(char *kind) @@ -114,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"); } @@ -127,26 +175,28 @@ void show_flist_stats(void) static void list_file_entry(struct file_struct *f) { char permbuf[PERMSTRING_SIZE]; + double len; - if (!f->basename) { + 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, - (double)f->length, timestring(f->modtime), - f_name(f, NULL), f->u.link); + permbuf, len, timestring(f->modtime), + f_name(f, NULL), F_SYMLINK(f)); } else #endif { rprintf(FINFO, "%s %11.0f %s %s\n", - permbuf, - (double)f->length, timestring(f->modtime), + permbuf, len, timestring(f->modtime), f_name(f, NULL)); } } @@ -174,12 +224,12 @@ static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf) rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", path, linkbuf); } - return do_stat(path, stp); + return x_stat(path, stp, NULL); } } return 0; #else - return do_stat(path, stp); + return x_stat(path, stp, NULL); #endif } @@ -187,17 +237,17 @@ int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks) { #ifdef SUPPORT_LINKS if (copy_links) - return do_stat(path, stp); - if (do_lstat(path, stp) < 0) + return x_stat(path, stp, NULL); + if (x_lstat(path, stp, NULL) < 0) return -1; if (follow_dirlinks && S_ISLNK(stp->st_mode)) { STRUCT_STAT st; - if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode)) + if (x_stat(path, &st, NULL) == 0 && S_ISDIR(st.st_mode)) *stp = st; } return 0; #else - return do_stat(path, stp); + return x_stat(path, stp, NULL); #endif } @@ -232,42 +282,19 @@ static int is_excluded(char *fname, int is_dir, int filter_level) return 0; } -static int to_wire_mode(mode_t mode) -{ -#ifdef SUPPORT_LINKS -#if _S_IFLNK != 0120000 - if (S_ISLNK(mode)) - return (mode & ~(_S_IFMT)) | 0120000; -#endif -#endif - return mode; -} - -static mode_t from_wire_mode(int mode) -{ -#if _S_IFLNK != 0120000 - if ((mode & (_S_IFMT)) == 0120000) - return (mode & ~(_S_IFMT)) | _S_IFLNK; -#endif - return mode; -} - static void send_directory(int f, struct file_list *flist, - char *fbuf, int len); + char *fbuf, int len, int flags); -static char *flist_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) @@ -277,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" : ""); @@ -300,9 +325,44 @@ void flist_expand(struct file_list *flist) out_of_memory("flist_expand"); } -static void send_file_entry(struct file_struct *file, int f) +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) + return 1; + + if (!orig_dir) + orig_dir = strdup(curr_dir); + + if (pathname && !pop_dir(orig_dir)) { + rsyserr(FERROR, errno, "pop_dir %s failed", + full_fname(orig_dir)); + exit_cleanup(RERR_FILESELECT); + } + + if (dir && !push_dir(dir, 0)) { + io_error |= IOERR_GENERAL; + rsyserr(FERROR, errno, "push_dir %s failed in %s", + full_fname(dir), curr_dir); + return 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, int first_ndx) { - unsigned short flags; static time_t modtime; static mode_t mode; static int64 dev; @@ -310,70 +370,118 @@ static void send_file_entry(struct file_struct *file, int f) static uint32 rdev_major; static uid_t uid; static gid_t gid; + static char *user_name, *group_name; static char lastname[MAXPATHLEN]; char fname[MAXPATHLEN]; + int first_hlink_ndx = -1; int l1, l2; + int xflags; - if (f < 0) - return; +#ifdef ICONV_OPTION + if (ic_send != (iconv_t)-1) { + xbuf outbuf, inbuf; - if (!file) { - write_byte(f, 0); - modtime = 0, mode = 0; - dev = 0, rdev = MAKEDEV(0, 0); - rdev_major = 0; - uid = 0, gid = 0; - *lastname = '\0'; - return; - } + INIT_CONST_XBUF(outbuf, fname); - f_name(file, fname); + 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++] = '/'; + } - flags = file->flags & XMIT_TOP_DIR; + 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 (file->u.rdev == rdev) - flags |= XMIT_SAME_RDEV_pre28; + if (tmp_rdev == rdev) + xflags |= XMIT_SAME_RDEV_pre28; else - rdev = file->u.rdev; + rdev = tmp_rdev; } else { - rdev = file->u.rdev; + 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 ((uint32)minor(rdev) <= 0xFFu) - flags |= XMIT_RDEV_MINOR_IS_SMALL; + if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu) + xflags |= XMIT_RDEV_MINOR_8_pre30; } } else if (protocol_version < 28) rdev = MAKEDEV(0, 0); - if (file->uid == uid) - flags |= XMIT_SAME_UID; - else - uid = file->uid; - if (file->gid == gid) - flags |= XMIT_SAME_GID; - else - gid = file->gid; + if (uid_ndx) { + if ((uid_t)F_OWNER(file) == uid && *lastname) + xflags |= XMIT_SAME_UID; + else { + uid = F_OWNER(file); + if (uid_ndx && !numeric_ids) { + user_name = add_uid(uid); + if (inc_recurse && user_name) + xflags |= XMIT_USER_NAME_FOLLOWS; + } + } + } + if (gid_ndx) { + if ((gid_t)F_GROUP(file) == gid && *lastname) + xflags |= XMIT_SAME_GID; + else { + gid = F_GROUP(file); + if (gid_ndx && !numeric_ids) { + group_name = add_gid(gid); + if (inc_recurse && group_name) + 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 (file->link_u.idev) { - if (file->F_DEV == dev) { - if (protocol_version >= 28) - flags |= XMIT_SAME_DEV; - } else - dev = file->F_DEV; - flags |= XMIT_HAS_IDEV_DATA; + if (tmp_dev != 0) { + if (protocol_version >= 30) { + struct ht_int64_node *np = idev_find(tmp_dev, tmp_ino); + first_hlink_ndx = (int32)(long)np->data - 1; + if (first_hlink_ndx < 0) { + high_hlink_ndx = ndx + first_ndx; + np->data = (void*)(long)(high_hlink_ndx + 1); + xflags |= XMIT_HLINK_FIRST; + } + xflags |= XMIT_HLINKED; + } else { + if (tmp_dev == dev) { + if (protocol_version >= 28) + xflags |= XMIT_SAME_DEV_pre30; + } else + dev = tmp_dev; + xflags |= XMIT_HLINKED; + } } #endif @@ -383,60 +491,85 @@ static void send_file_entry(struct file_struct *file, int f) 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_byte(f, flags); - write_byte(f, flags >> 8); + 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) - write_int(f, l2); + if (xflags & XMIT_LONG_NAME) + write_varint30(f, l2); else write_byte(f, l2); write_buf(f, fname + l1, l2); - write_longint(f, file->length); - if (!(flags & XMIT_SAME_TIME)) - write_int(f, modtime); - if (!(flags & XMIT_SAME_MODE)) + if (first_hlink_ndx >= 0) { + write_varint(f, first_hlink_ndx); + if (first_hlink_ndx >= first_ndx) + goto the_end; + } + + write_varlong30(f, F_LENGTH(file), 3); + if (!(xflags & XMIT_SAME_TIME)) { + if (protocol_version >= 30) + write_varlong(f, modtime, 4); + else + write_int(f, modtime); + } + if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); - if (preserve_uid && !(flags & XMIT_SAME_UID)) { - if (!numeric_ids) - add_uid(uid); - write_int(f, uid); + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (protocol_version < 30) + write_int(f, uid); + else { + write_varint(f, uid); + 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 (!numeric_ids) - add_gid(gid); - write_int(f, gid); + if (gid_ndx && !(xflags & XMIT_SAME_GID)) { + if (protocol_version < 30) + write_int(f, gid); + else { + write_varint(f, gid); + if (xflags & XMIT_GROUP_NAME_FOLLOWS) { + int len = strlen(group_name); + write_byte(f, len); + write_buf(f, group_name, len); + } + } } 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)) - write_int(f, major(rdev)); - if (flags & XMIT_RDEV_MINOR_IS_SMALL) + if (!(xflags & XMIT_SAME_RDEV_MAJOR)) + write_varint30(f, major(rdev)); + if (protocol_version >= 30) + write_varint(f, minor(rdev)); + else if (xflags & XMIT_RDEV_MINOR_8_pre30) write_byte(f, minor(rdev)); else write_int(f, minor(rdev)); @@ -445,31 +578,32 @@ static void send_file_entry(struct file_struct *file, int f) #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(mode)) { - int len = strlen(file->u.link); - write_int(f, len); - write_buf(f, file->u.link, len); + const char *sl = F_SYMLINK(file); + int len = strlen(sl); + write_varint30(f, len); + write_buf(f, sl, len); } #endif #ifdef SUPPORT_HARD_LINKS - if (file->link_u.idev) { + if (tmp_dev != 0 && protocol_version < 30) { if (protocol_version < 26) { /* 32-bit dev_t and ino_t */ - write_int(f, dev); - write_int(f, file->F_INODE); + write_int(f, (int32)dev); + write_int(f, (int32)tmp_ino); } else { /* 64-bit dev_t and ino_t */ - if (!(flags & XMIT_SAME_DEV)) + if (!(xflags & XMIT_SAME_DEV_pre30)) write_longint(f, dev); - write_longint(f, file->F_INODE); + write_longint(f, tmp_ino); } } #endif if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) { - char *sum; + const char *sum; if (S_ISREG(mode)) - sum = file->u.sum; + sum = tmp_sum; else { /* Prior to 28, we sent a useless set of nulls. */ sum = empty_sum; @@ -477,61 +611,78 @@ static void send_file_entry(struct file_struct *file, int f) write_buf(f, sum, checksum_len); } + the_end: strlcpy(lastname, fname, MAXPATHLEN); + + if (S_ISREG(mode) || S_ISLNK(mode)) + stats.total_size += F_LENGTH(file); } -static struct file_struct *receive_file_entry(struct file_list *flist, - unsigned short flags, int f) +static struct file_struct *recv_file_entry(struct file_list *flist, + int xflags, int f) { - static time_t modtime; + static int64 modtime; static mode_t mode; static int64 dev; static dev_t rdev; 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; static int in_del_hier = 0; char thisname[MAXPATHLEN]; unsigned int l1 = 0, l2 = 0; - int alloc_len, basename_len, dirname_len, linkname_len, sum_len; + int alloc_len, basename_len, linkname_len; + int extra_len = file_extra_cnt * EXTRA_LEN; + int first_hlink_ndx = -1; OFF_T file_length; - char *basename, *dirname, *bp; + const char *basename; struct file_struct *file; + alloc_pool_t *pool; + char *bp; - if (!flist) { - modtime = 0, mode = 0; - dev = 0, rdev = MAKEDEV(0, 0); - rdev_major = 0; - uid = 0, gid = 0; - *lastname = '\0'; - lastdir_len = -1; - in_del_hier = 0; - return NULL; - } - - if (flags & XMIT_SAME_NAME) + if (xflags & XMIT_SAME_NAME) l1 = read_byte(f); - if (flags & XMIT_LONG_NAME) - l2 = read_int(f); + 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\n", - flags, l1, l2, lastname); - overflow_exit("receive_file_entry"); + "overflow: xflags=0x%x l1=%d l2=%d lastname=%s [%s]\n", + xflags, l1, l2, lastname, who_am_i()); + overflow_exit("recv_file_entry"); } strlcpy(thisname, lastname, l1 + 1); 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); @@ -539,205 +690,333 @@ static struct file_struct *receive_file_entry(struct file_list *flist, sanitize_path(thisname, thisname, "", 0, NULL); if ((basename = strrchr(thisname, '/')) != NULL) { - dirname_len = ++basename - thisname; /* counts future '\0' */ - if (lastdir_len == dirname_len - 1 - && strncmp(thisname, lastdir, lastdir_len) == 0) { - dirname = lastdir; - dirname_len = 0; /* indicates no copy is needed */ - } else - dirname = thisname; - } else { + int len = basename++ - thisname; + if (len != lastdir_len || memcmp(thisname, lastdir, len) != 0) { + lastdir = new_array(char, len + 1); + memcpy(lastdir, thisname, len); + lastdir[len] = '\0'; + lastdir_len = len; + lastdir_depth = count_dir_elements(lastdir); + } + } else basename = thisname; - dirname = NULL; - dirname_len = 0; - } basename_len = strlen(basename) + 1; /* count the '\0' */ - file_length = read_longint(f); - if (!(flags & XMIT_SAME_TIME)) - modtime = (time_t)read_int(f); - if (!(flags & XMIT_SAME_MODE)) +#ifdef SUPPORT_HARD_LINKS + if (protocol_version >= 30 + && 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->ndx_start + flist->used); + exit_cleanup(RERR_PROTOCOL); + } + 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 (!(xflags & XMIT_SAME_TIME)) { + if (protocol_version >= 30) { + modtime = read_varlong(f, 4); +#if SIZEOF_TIME_T < SIZEOF_INT64 + if ((modtime > INT_MAX || modtime < INT_MIN) && !am_generator) { + rprintf(FERROR, + "Time value of %s truncated on receiver.\n", + lastname); + } +#endif + } else + modtime = read_int(f); + } + 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)) - uid = (uid_t)read_int(f); - if (preserve_gid && !(flags & XMIT_SAME_GID)) - gid = (gid_t)read_int(f); + 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 (xflags & XMIT_USER_NAME_FOLLOWS) + uid = recv_user_name(f, uid); + else if (inc_recurse && am_root && !numeric_ids) + uid = match_uid(uid); + } + } + if (gid_ndx && !(xflags & XMIT_SAME_GID)) { + if (protocol_version < 30) + gid = (gid_t)read_int(f); + else { + gid = (gid_t)read_varint(f); + 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_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)) - rdev_major = read_int(f); - if (flags & XMIT_RDEV_MINOR_IS_SMALL) + if (!(xflags & XMIT_SAME_RDEV_MAJOR)) + rdev_major = read_varint30(f); + if (protocol_version >= 30) + rdev_minor = read_varint(f); + 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 += DEV_EXTRA_CNT * EXTRA_LEN; + file_length = 0; } else if (protocol_version < 28) rdev = MAKEDEV(0, 0); #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(mode)) { - linkname_len = read_int(f) + 1; /* count the '\0' */ + linkname_len = read_varint30(f) + 1; /* count the '\0' */ if (linkname_len <= 0 || linkname_len > MAXPATHLEN) { rprintf(FERROR, "overflow: linkname_len=%d\n", linkname_len - 1); - overflow_exit("receive_file_entry"); + overflow_exit("recv_file_entry"); } } else #endif linkname_len = 0; - sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0; +#ifdef SUPPORT_HARD_LINKS + create_object: + if (preserve_hard_links) { + if (protocol_version < 28 && S_ISREG(mode)) + xflags |= XMIT_HLINKED; + if (xflags & XMIT_HLINKED) + extra_len += (inc_recurse+1) * EXTRA_LEN; + } +#endif + +#ifdef SUPPORT_ACLS + /* We need one or two index int32s when we're preserving ACLs. */ + if (preserve_acls) + extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN; +#endif - alloc_len = file_struct_len + dirname_len + basename_len - + linkname_len + sum_len; - bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry"); + if (always_checksum && S_ISREG(mode)) + extra_len += SUM_EXTRA_CNT * EXTRA_LEN; + + if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) + extra_len += EXTRA_LEN; + +#if EXTRA_ROUNDING > 0 + if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) + extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN; +#endif + if (inc_recurse && S_ISDIR(mode)) { + if (one_file_system) { + /* Room to save the dir's device for -x */ + extra_len += DEV_EXTRA_CNT * EXTRA_LEN; + } + pool = dir_flist->file_pool; + } else + pool = flist->file_pool; + + alloc_len = FILE_STRUCT_LEN + extra_len + basename_len + + linkname_len; + bp = pool_alloc(pool, alloc_len, "recv_file_entry"); + + memset(bp, 0, extra_len + FILE_STRUCT_LEN); + bp += extra_len; file = (struct file_struct *)bp; - memset(bp, 0, file_struct_len); - bp += file_struct_len; + bp += FILE_STRUCT_LEN; - file->modtime = modtime; - file->length = file_length; + memcpy(bp, basename, basename_len); + bp += basename_len + linkname_len; /* skip space for symlink too */ + +#ifdef SUPPORT_HARD_LINKS + if (xflags & XMIT_HLINKED) + file->flags |= FLAG_HLINKED; +#endif + file->modtime = (time_t)modtime; + file->len32 = (uint32)file_length; + if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) { + file->flags |= FLAG_LENGTH64; + OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); + } file->mode = mode; - file->uid = uid; - file->gid = gid; - - if (dirname_len) { - file->dirname = lastdir = bp; - lastdir_len = dirname_len - 1; - memcpy(bp, dirname, dirname_len - 1); - bp += dirname_len; - bp[-1] = '\0'; - lastdir_depth = count_dir_elements(lastdir); - file->dir.depth = lastdir_depth + 1; - } else if (dirname) { - file->dirname = dirname; /* we're reusing lastname */ - file->dir.depth = lastdir_depth + 1; + if (uid_ndx) + F_OWNER(file) = uid; + 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; + F_DEPTH(file) = lastdir_depth + 1; } else - file->dir.depth = 1; + F_DEPTH(file) = 1; if (S_ISDIR(mode)) { if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */ - file->dir.depth--; - if (flags & XMIT_TOP_DIR) { + F_DEPTH(file)--; + if (xflags & XMIT_TOP_DIR) { in_del_hier = recurse; - del_hier_name_len = file->dir.depth == 0 ? 0 : l1 + l2; + 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_DEL_HERE; + 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 && lastname[del_hier_name_len] == '/')) - file->flags |= FLAG_DEL_HERE; + file->flags |= FLAG_XFER_DIR; else in_del_hier = 0; } } - file->basename = bp; - memcpy(bp, basename, basename_len); - bp += basename_len; - if ((preserve_devices && IS_DEVICE(mode)) - || (preserve_specials && IS_SPECIAL(mode))) - file->u.rdev = rdev; + || (preserve_specials && IS_SPECIAL(mode))) { + uint32 *devp = F_RDEV_P(file); + DEV_MAJOR(devp) = major(rdev); + DEV_MINOR(devp) = minor(rdev); + } #ifdef SUPPORT_LINKS if (linkname_len) { - file->u.link = bp; - read_sbuf(f, bp, linkname_len - 1); + bp = (char*)file->basename + basename_len; + 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); if (sanitize_paths) sanitize_path(bp, bp, "", lastdir_depth, NULL); - bp += linkname_len; } #endif #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode)) - flags |= XMIT_HAS_IDEV_DATA; - if (flags & XMIT_HAS_IDEV_DATA) { - int64 inode; - if (protocol_version < 26) { - dev = read_int(f); - inode = read_int(f); + if (preserve_hard_links && xflags & XMIT_HLINKED) { + if (protocol_version >= 30) { + 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 { - if (!(flags & XMIT_SAME_DEV)) - dev = read_longint(f); - inode = read_longint(f); - } - if (flist->hlink_pool) { - file->link_u.idev = pool_talloc(flist->hlink_pool, - struct idev, 1, "inode_table"); - file->F_INODE = inode; - file->F_DEV = dev; + static int32 cnt = 0; + struct ht_int64_node *np; + int64 ino; + int32 ndx; + if (protocol_version < 26) { + dev = read_int(f); + ino = read_int(f); + } else { + if (!(xflags & XMIT_SAME_DEV_pre30)) + dev = read_longint(f); + ino = read_longint(f); + } + np = idev_find(dev, ino); + ndx = (int32)(long)np->data - 1; + if (ndx < 0) { + ndx = cnt++; + np->data = (void*)(long)cnt; + } + F_HL_GNUM(file) = ndx; } } #endif - if (always_checksum && (sum_len || protocol_version < 28)) { - char *sum; - if (sum_len) { - file->u.sum = sum = bp; - /*bp += sum_len;*/ - } else { + if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) { + if (S_ISREG(mode)) + bp = F_SUM(file); + else { /* Prior to 28, we get a useless set of nulls. */ - sum = empty_sum; + bp = tmp_sum; } - read_buf(f, sum, checksum_len); + 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); } +#ifdef SUPPORT_ACLS + if (preserve_acls && !S_ISLNK(mode)) + receive_acl(file, f); +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + receive_xattr(file, f ); +#endif + + if (S_ISREG(mode) || S_ISLNK(mode)) + stats.total_size += file_length; + 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. - **/ -struct file_struct *make_file(char *fname, struct file_list *flist, - STRUCT_STAT *stp, unsigned short flags, - int filter_level) + * 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 sum[SUM_LENGTH]; char thisname[MAXPATHLEN]; char linkname[MAXPATHLEN]; - int alloc_len, basename_len, dirname_len, linkname_len, sum_len; - char *basename, *dirname, *bp; - - if (!flist || !flist->count) /* Ignore lastdir when invalid. */ - lastdir_len = -1; + 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; } @@ -745,8 +1024,6 @@ struct file_struct *make_file(char *fname, struct file_list *flist, if (sanitize_paths) sanitize_path(thisname, thisname, "", 0, NULL); - memset(sum, 0, SUM_LENGTH); - if (stp && S_ISDIR(stp->st_mode)) { st = *stp; /* Needed for "symlink/." with --relative. */ *linkname = '\0'; /* make IBM code checker happy */ @@ -763,7 +1040,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist, if (save_errno == ENOENT) { #ifdef SUPPORT_LINKS /* Avoid "vanished" error if symlink points nowhere. */ - if (copy_links && do_lstat(thisname, &st) == 0 + if (copy_links && x_lstat(thisname, &st, NULL) == 0 && S_ISLNK(st.st_mode)) { io_error |= IOERR_GENERAL; rprintf(FERROR, "symlink has no referent: %s\n", @@ -789,12 +1066,15 @@ struct file_struct *make_file(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; - /* We only care about directories because we need to avoid recursing + /* -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 && st.st_dev != filesystem_dev @@ -806,7 +1086,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist, } return NULL; } - flags |= FLAG_MOUNT_POINT; + flags |= FLAG_MOUNT_DIR; } if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) { @@ -825,24 +1105,34 @@ struct file_struct *make_file(char *fname, struct file_list *flist, skip_filters: + /* Only divert a directory in the main transfer. */ + 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", who_am_i(), thisname, filter_level); } if ((basename = strrchr(thisname, '/')) != NULL) { - dirname_len = ++basename - thisname; /* counts future '\0' */ - if (lastdir_len == dirname_len - 1 - && strncmp(thisname, lastdir, lastdir_len) == 0) { - dirname = lastdir; - dirname_len = 0; /* indicates no copy is needed */ - } else - dirname = thisname; - } else { + int len = basename++ - thisname; + if (len != lastdir_len || memcmp(thisname, lastdir, len) != 0) { + lastdir = new_array(char, len + 1); + memcpy(lastdir, thisname, len); + lastdir[len] = '\0'; + lastdir_len = len; + } + } else basename = thisname; - dirname = NULL; - dirname_len = 0; - } basename_len = strlen(basename) + 1; /* count the '\0' */ #ifdef SUPPORT_LINKS @@ -851,83 +1141,77 @@ struct file_struct *make_file(char *fname, struct file_list *flist, linkname_len = 0; #endif - sum_len = always_checksum && am_sender && S_ISREG(st.st_mode) - ? MD4_SUM_LENGTH : 0; + if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) + extra_len += EXTRA_LEN; - alloc_len = file_struct_len + dirname_len + basename_len - + linkname_len + sum_len; - if (flist) - bp = pool_alloc(flist->file_pool, alloc_len, "make_file"); +#if EXTRA_ROUNDING > 0 + if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) + extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN; +#endif + + alloc_len = FILE_STRUCT_LEN + extra_len + basename_len + + linkname_len; + if (pool) + bp = pool_alloc(pool, alloc_len, "make_file"); else { if (!(bp = new_array(char, alloc_len))) out_of_memory("make_file"); } + memset(bp, 0, extra_len + FILE_STRUCT_LEN); + bp += extra_len; file = (struct file_struct *)bp; - memset(bp, 0, file_struct_len); - bp += file_struct_len; + bp += FILE_STRUCT_LEN; - file->flags = flags; - file->modtime = st.st_mtime; - file->length = st.st_size; - file->mode = st.st_mode; - file->uid = st.st_uid; - file->gid = st.st_gid; + memcpy(bp, basename, basename_len); + bp += basename_len + linkname_len; /* skip space for symlink too */ #ifdef SUPPORT_HARD_LINKS - if (flist && flist->hlink_pool) { - if (protocol_version < 28) { - if (S_ISREG(st.st_mode)) - file->link_u.idev = pool_talloc( - flist->hlink_pool, struct idev, 1, - "inode_table"); - } else { - if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) - file->link_u.idev = pool_talloc( - flist->hlink_pool, struct idev, 1, - "inode_table"); - } - } - if (file->link_u.idev) { - file->F_DEV = st.st_dev; - file->F_INODE = st.st_ino; + if (preserve_hard_links && flist && flist->prev) { + if (protocol_version >= 28 + ? (!S_ISDIR(st.st_mode) && st.st_nlink > 1) + : S_ISREG(st.st_mode)) { + tmp_dev = st.st_dev; + tmp_ino = st.st_ino; + } else + tmp_dev = 0; } #endif - if (dirname_len) { - file->dirname = lastdir = bp; - lastdir_len = dirname_len - 1; - memcpy(bp, dirname, dirname_len - 1); - bp += dirname_len; - bp[-1] = '\0'; - } else if (dirname) - file->dirname = dirname; - - file->basename = bp; - memcpy(bp, basename, basename_len); - bp += basename_len; - #ifdef HAVE_STRUCT_STAT_ST_RDEV - if ((preserve_devices && IS_DEVICE(st.st_mode)) - || (preserve_specials && IS_SPECIAL(st.st_mode))) - file->u.rdev = st.st_rdev; + if (IS_DEVICE(st.st_mode) || IS_SPECIAL(st.st_mode)) { + tmp_rdev = st.st_rdev; + st.st_size = 0; + } #endif + file->flags = flags; + file->modtime = st.st_mtime; + file->len32 = (uint32)st.st_size; + if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) { + file->flags |= FLAG_LENGTH64; + OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); + } + file->mode = st.st_mode; + if (uid_ndx) + F_OWNER(file) = st.st_uid; + if (gid_ndx) + F_GROUP(file) = st.st_gid; + + if (basename != thisname) + file->dirname = lastdir; + #ifdef SUPPORT_LINKS if (linkname_len) { - file->u.link = bp; + bp = (char*)file->basename + basename_len; memcpy(bp, linkname, linkname_len); - bp += linkname_len; } #endif - if (sum_len) { - file->u.sum = bp; - file_checksum(thisname, bp, st.st_size); - /*bp += sum_len;*/ - } + if (always_checksum && am_sender && S_ISREG(st.st_mode)) + file_checksum(thisname, tmp_sum, st.st_size); - file->dir.root = 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. */ @@ -935,57 +1219,104 @@ struct file_struct *make_file(char *fname, struct file_list *flist, STRUCT_STAT st2; int save_mode = file->mode; file->mode = S_IFDIR; /* Find a directory with our name. */ - if (flist_find(the_file_list, file) >= 0 - && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) { + if (flist_find(dir_flist, file) >= 0 + && x_stat(thisname, &st2, NULL) == 0 && S_ISDIR(st2.st_mode)) { file->modtime = st2.st_mtime; - file->length = st2.st_size; + file->len32 = 0; file->mode = st2.st_mode; - file->uid = st2.st_uid; - file->gid = st2.st_gid; - file->u.link = NULL; + if (uid_ndx) + F_OWNER(file) = st2.st_uid; + if (gid_ndx) + F_GROUP(file) = st2.st_gid; } else file->mode = save_mode; } - if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) - stats.total_size += st.st_size; + if (basename_len == 0+1) + return NULL; + +#ifdef ICONV_OPTION + if (ic_ndx) + F_NDX(file) = dir_count - 1; +#endif return file; } +/* Only called for temporary file_struct entries created by make_file(). */ +void unmake_file(struct file_struct *file) +{ + int extra_cnt = file_extra_cnt + LEN64_BUMP(file); +#if EXTRA_ROUNDING > 0 + if (extra_cnt & EXTRA_ROUNDING) + extra_cnt = (extra_cnt | EXTRA_ROUNDING) + 1; +#endif + free(REQ_EXTRA(file, extra_cnt)); +} + static struct file_struct *send_file_name(int f, struct file_list *flist, char *fname, STRUCT_STAT *stp, - unsigned short 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, - f == -2 ? SERVER_FILTERS : ALL_FILTERS); + file = make_file(fname, flist, stp, flags, filter_level); if (!file) return NULL; if (chmod_modes && !S_ISLNK(file->mode)) file->mode = tweak_mode(file->mode, chmod_modes); - maybe_emit_filelist_progress(flist->count + flist_count_offset); +#ifdef SUPPORT_ACLS + if (preserve_acls && !S_ISLNK(file->mode) && f >= 0) { + sx.st.st_mode = file->mode; + sx.acc_acl = sx.def_acl = NULL; + if (get_acl(fname, &sx) < 0) + return NULL; + } +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs && f >= 0) { + sx.xattr = NULL; + if (get_xattr(fname, &sx) < 0) + return NULL; + } +#endif - flist_expand(flist); + maybe_emit_filelist_progress(flist->used + flist_count_offset); - if (file->basename[0]) { - flist->files[flist->count++] = file; - send_file_entry(file, f); + flist_expand(flist, 1); + flist->files[flist->used++] = file; + if (f >= 0) { + 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); + free_acl(&sx); + } +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) { + F_XATTR(file) = send_xattr(&sx, f); + free_xattr(&sx); + } +#endif } return file; } static void send_if_directory(int f, struct file_list *flist, struct file_struct *file, - char *fbuf, unsigned int ol) + char *fbuf, unsigned int ol, + int flags) { char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/'); if (S_ISDIR(file->mode) - && !(file->flags & FLAG_MOUNT_POINT) && f_name(file, fbuf)) { + && !(file->flags & FLAG_MOUNT_DIR) && f_name(file, fbuf)) { void *save_filters; unsigned int len = strlen(fbuf); if (len > 1 && fbuf[len-1] == '/') @@ -997,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, fbuf, len); + send_directory(f, flist, fbuf, len, flags); pop_local_filters(save_filters); fbuf[ol] = '\0'; if (is_dot_dir) @@ -1005,19 +1336,130 @@ static void send_if_directory(int f, struct file_list *flist, } } +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) +{ + 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_DIR_NODE_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]; + + if (!S_ISDIR(file->mode)) + continue; + + dir_flist->files[dir_flist->used++] = file; + dir_cnt--; + + if (!(file->flags & FLAG_XFER_DIR) + || file->flags & FLAG_MOUNT_DIR) + continue; + + if (dp) + DIR_NEXT_SIBLING(dp) = dir_flist->used - 1; + else if (parent_dp) + DIR_FIRST_CHILD(parent_dp) = dir_flist->used - 1; + else + send_dir_ndx = dir_flist->used - 1; + + dp = F_DIR_NODE_P(file); + DIR_PARENT(dp) = parent_ndx; + DIR_FIRST_CHILD(dp) = -1; + } + if (dp) + DIR_NEXT_SIBLING(dp) = -1; +} + /* This function is normally called by the sender, but the receiving side also * calls it from get_dirlist() with f set to -1 so that we just construct the * 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, - char *fbuf, int len) +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 start = flist->count; + int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0; + int start = flist->used; + int filter_level = f == -2 ? SERVER_FILTERS : ALL_FILTERS; + + assert(flist != NULL); if (!(d = opendir(fbuf))) { io_error |= IOERR_GENERAL; @@ -1043,8 +1485,15 @@ static void send_directory(int f, struct file_list *flist, 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, 0); + send_file_name(f, flist, fbuf, NULL, flags, filter_level); } fbuf[len] = '\0'; @@ -1056,38 +1505,180 @@ static void send_directory(int f, struct file_list *flist, closedir(d); - if (recurse) { - int i, end = flist->count - 1; + 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); + send_if_directory(f, flist, flist->files[i], fbuf, len, flags); } } +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; + + if (flist_eof) + return; + + /* Keep sending data until we have the requested number of + * files in the upcoming file-lists. */ + if (cur_flist->next) { + flist = first_flist->prev; /* the newest flist */ + 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->sorted[send_dir_ndx]; + int dir_ndx, dstart = dir_count; + const char *pathname = F_PATHNAME(file); + int32 *dp; + + flist = flist_new(0, "send_extra_file_list"); + start_write = stats.total_written; + +#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); + +#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->used; + if (verbose > 3) + output_flist(flist); + + if (DIR_FIRST_CHILD(dp) >= 0) { + send_dir_ndx = DIR_FIRST_CHILD(dp); + send_dir_depth++; + } else { + while (DIR_NEXT_SIBLING(dp) < 0) { + if ((send_dir_ndx = DIR_PARENT(dp)) < 0) { + write_ndx(f, NDX_FLIST_EOF); + flist_eof = 1; + change_local_filter_dir(NULL, 0, 0); + goto finish; + } + send_dir_depth--; + file = dir_flist->sorted[send_dir_ndx]; + dp = F_DIR_NODE_P(file); + } + send_dir_ndx = DIR_NEXT_SIBLING(dp); + } + } + + finish: + if (io_error != save_io_error && !ignore_errors) + send_msg_int(MSG_IO_ERROR, io_error); +} + struct file_list *send_file_list(int f, int argc, char *argv[]) { - int len; + static const char *lastdir; + static int lastdir_len = -1; + int len, dirlen; STRUCT_STAT st; - char *p, *dir, olddir[sizeof curr_dir]; + char *p, *dir; char lastpath[MAXPATHLEN] = ""; struct file_list *flist; struct timeval start_tv, end_tv; 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()) start_filelist_progress("building file list"); + else if (inc_recurse && verbose && !am_server) + rprintf(FCLIENT, "sending incremental file list\n"); start_write = stats.total_written; gettimeofday(&start_tv, NULL); - flist = flist_new(WITH_HLINK, "send_file_list"); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && protocol_version >= 30 && !cur_flist) + init_hard_links(); +#endif - io_start_buffering_out(); + 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 { + dir_flist = cur_flist; + flags = FLAG_XFER_DIR; + } + + disable_buffering = io_start_buffering_out(f); if (filesfrom_fd >= 0) { if (argv[0] && !push_dir(argv[0], 0)) { - rsyserr(FERROR, errno, "push_dir %s failed", - full_fname(argv[0])); + rsyserr(FERROR, errno, "push_dir %s failed in %s", + full_fname(argv[0]), curr_dir); exit_cleanup(RERR_FILESELECT); } use_ff_fd = 1; @@ -1099,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 { @@ -1138,20 +1729,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) && (len == 1 || fbuf[len-2] == '/'); } - if (link_stat(fbuf, &st, copy_dirlinks) != 0) { - io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "link_stat %s failed", - full_fname(fbuf)); - continue; - } - - if (S_ISDIR(st.st_mode) && !xfer_dirs) { - rprintf(FINFO, "skipping directory %s\n", fbuf); - continue; - } - dir = NULL; - olddir[0] = '\0'; if (!relative_paths) { p = strrchr(fbuf, '/'); @@ -1215,31 +1793,30 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) fn = "."; } - if (dir && *dir) { - static char *lastdir; - static int lastdir_len; - - strlcpy(olddir, curr_dir, sizeof olddir); - - if (!push_dir(dir, 0)) { - io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "push_dir %s failed", - full_fname(dir)); + dirlen = dir ? strlen(dir) : 0; + if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { + if (!push_pathname(dir ? strdup(dir) : NULL, dirlen)) continue; - } - - if (lastdir && strcmp(lastdir, dir) == 0) { - flist_dir = lastdir; - flist_dir_len = lastdir_len; - } else { - flist_dir = lastdir = strdup(dir); - flist_dir_len = lastdir_len = strlen(dir); - } - } + lastdir = pathname; + lastdir_len = pathname_len; + } else if (!push_pathname(lastdir, lastdir_len)) + continue; if (fn != fbuf) memmove(fbuf, fn, len + 1); + if (link_stat(fbuf, &st, copy_dirlinks) != 0) { + io_error |= IOERR_GENERAL; + rsyserr(FERROR, errno, "link_stat %s failed", + full_fname(fbuf)); + continue; + } + + if (S_ISDIR(st.st_mode) && !xfer_dirs) { + rprintf(FINFO, "skipping directory %s\n", fbuf); + continue; + } + if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) { /* Send the implied directories at the start of the * source spec, so we get their permissions right. */ @@ -1255,11 +1832,13 @@ 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 = flags & ~FLAG_XFER_DIR; copy_links |= copy_unsafe_links; xfer_dirs = 1; while ((slash = strchr(slash+1, '/')) != 0) { *slash = '\0'; - send_file_name(f, flist, fbuf, NULL, 0); + send_file_name(f, flist, fbuf, NULL, + dir_flags, ALL_FILTERS); *slash = '/'; } copy_links = save_copy_links; @@ -1275,21 +1854,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (recurse || (xfer_dirs && is_dot_dir)) { struct file_struct *file; - file = send_file_name(f, flist, fbuf, &st, FLAG_TOP_DIR); - if (file) - send_if_directory(f, flist, file, fbuf, len); + int top_flags = FLAG_TOP_DIR | flags; + file = send_file_name(f, flist, fbuf, &st, + top_flags, ALL_FILTERS); + if (file && !inc_recurse) + send_if_directory(f, flist, file, fbuf, len, flags); } else - send_file_name(f, flist, fbuf, &st, 0); - - if (olddir[0]) { - flist_dir = NULL; - flist_dir_len = 0; - if (!pop_dir(olddir)) { - rsyserr(FERROR, errno, "pop_dir %s failed", - full_fname(olddir)); - exit_cleanup(RERR_FILESELECT); - } - } + send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS); } gettimeofday(&end_tv, NULL); @@ -1299,7 +1870,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) stats.flist_buildtime = 1; start_tv = end_tv; - send_file_entry(NULL, f); + write_byte(f, 0); /* Indicate end of file list */ + +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && protocol_version >= 30 && !inc_recurse) + idev_destroy(); +#endif if (show_filelist_p()) finish_filelist_progress(flist); @@ -1308,25 +1884,53 @@ 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; - if (flist->hlink_pool) { - pool_destroy(flist->hlink_pool); - flist->hlink_pool = NULL; - } + /* 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 any name they like, which gives us the - * flexibility to change the way we unduplicate names in the future - * without causing a compatibility problem with older versions. */ - clean_flist(flist, 0, 0); + * 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; - send_uid_list(f); + if (!numeric_ids && !inc_recurse) + send_id_list(f); /* send the io_error flag */ - write_int(f, lp_ignore_errors(module_id) ? 0 : io_error); + if (protocol_version < 30) + write_int(f, ignore_errors ? 0 : io_error); + else if (io_error && !ignore_errors) + send_msg_int(MSG_IO_ERROR, io_error); + + if (disable_buffering) + io_end_buffering_out(); - io_end_buffering(); stats.flist_size = stats.total_written - start_write; - stats.num_files = flist->count; + stats.num_files = flist->used; if (verbose > 3) output_flist(flist); @@ -1334,65 +1938,129 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (verbose > 2) rprintf(FINFO, "send_file_list done\n"); + if (inc_recurse) { + 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; + } + else if (file_total == 1) { + /* If we're creating incremental file-lists and there + * was just 1 item in the first file-list, send 1 more + * file-list to check if this is a 1-file xfer. */ + send_extra_file_list(f, 1); + } + } + return flist; } struct file_list *recv_file_list(int f) { struct file_list *flist; - unsigned short flags; + int dstart, flags; int64 start_read; - rprintf(FLOG, "receiving file list\n"); + if (!first_flist) + rprintf(FLOG, "receiving file list\n"); if (show_filelist_p()) start_filelist_progress("receiving file list"); + else if (inc_recurse && verbose && !am_server && !first_flist) + rprintf(FCLIENT, "receiving incremental file list\n"); start_read = stats.total_read; - flist = flist_new(WITH_HLINK, "recv_file_list"); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && !first_flist) + init_hard_links(); +#endif - flist->count = 0; - flist->malloced = 1000; - flist->files = new_array(struct file_struct *, flist->malloced); - if (!flist->files) - goto oom; + 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->used; + } else { + dir_flist = flist; + dstart = 0; + } 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 = receive_file_entry(flist, flags, f); + file = recv_file_entry(flist, flags, f); - if (S_ISREG(file->mode) || S_ISLNK(file->mode)) - stats.total_size += file->length; + if (inc_recurse && S_ISDIR(file->mode)) { + 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)); } } - receive_file_entry(NULL, 0, 0); /* Signal that we're done. */ + 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 (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 */ - if (lp_ignore_errors(module_id) || ignore_errors) + if (ignore_errors) read_int(f); else io_error |= read_int(f); @@ -1403,26 +2071,45 @@ 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]); } if (verbose > 2) rprintf(FINFO, "recv_file_list done\n"); - stats.flist_size = stats.total_read - start_read; - stats.num_files = flist->count; + stats.flist_size += stats.total_read - start_read; + stats.num_files += flist->used; return flist; - - oom: - out_of_memory("recv_file_list"); - return NULL; /* not reached */ } -static int file_compare(struct file_struct **file1, struct file_struct **file2) +/* This is only used once by the receiver if the very first file-list + * has exactly one item in it. */ +void recv_additional_file_list(int f) { - return f_name_cmp(*file1, *file2); + struct file_list *flist; + int ndx = read_ndx(f); + if (ndx == NDX_FLIST_EOF) { + flist_eof = 1; + change_local_filter_dir(NULL, 0, 0); + } else { + ndx = NDX_FLIST_OFFSET - ndx; + if (ndx < 0 || ndx >= dir_flist->used) { + ndx = NDX_FLIST_OFFSET - ndx; + rprintf(FERROR, + "[%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; + } } /* Search for an identically-named item in the file list. Note that the @@ -1434,36 +2121,36 @@ int flist_find(struct file_list *flist, struct file_struct *f) while (low <= high) { mid = (low + high) / 2; - if (flist->files[mid]->basename) + 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 + flist->files[mid]->dir.depth; - if (!flist->files[mid_up]->basename) { + mid_up = mid + F_DEPTH(flist->sorted[mid]); + if (!F_IS_ACTIVE(flist->sorted[mid_up])) { do { - mid_up += flist->files[mid_up]->dir.depth; - } while (!flist->files[mid_up]->basename); - flist->files[mid]->dir.depth = 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 - flist->files[mid]->length; - if (!flist->files[high]->basename) { + high = mid - (int)flist->sorted[mid]->len32; + if (!F_IS_ACTIVE(flist->sorted[high])) { do { - high -= flist->files[high]->length; - } while (!flist->files[high]->basename); - flist->files[mid]->length = 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; @@ -1480,90 +2167,129 @@ int flist_find(struct file_list *flist, struct file_struct *f) * Free up any resources a file_struct has allocated * and clear the file. */ -void clear_file(struct file_struct *file, struct file_list *flist) +void clear_file(struct file_struct *file) { - if (flist->hlink_pool && file->link_u.idev) - pool_free(flist->hlink_pool, 0, file->link_u.idev); - memset(file, 0, file_struct_len); - /* In an empty entry, dir.depth is an offset to the next non-empty - * entry. Likewise for length in the opposite direction. We assume + /* The +1 zeros out the first char of the basename. */ + memset(file, 0, FILE_STRUCT_LEN + 1); + /* In an empty entry, F_DEPTH() is an offset to the next non-empty + * entry. Likewise for len32 in the opposite direction. We assume * that we're alone for now since flist_find() will adjust the counts * it runs into that aren't up-to-date. */ - file->length = file->dir.depth = 1; + file->len32 = F_DEPTH(file) = 1; } -/* - * allocate a new file list - */ -struct file_list *flist_new(int with_hlink, char *msg) +/* Allocate a new file list. */ +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 (struct file_list)); + 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) { + 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 { + flist->file_pool = first_flist->file_pool; - if (!(flist->file_pool = pool_create(FILE_EXTENT, 0, - out_of_memory, POOL_INTERN))) - out_of_memory(msg); + flist->ndx_start = first_flist->prev->ndx_end + 2; + if (flist->ndx_start <= high_hlink_ndx) + flist->ndx_start = high_hlink_ndx + 1; -#ifdef SUPPORT_HARD_LINKS - if (with_hlink && preserve_hard_links) { - if (!(flist->hlink_pool = pool_create(HLINK_EXTENT, - sizeof (struct idev), out_of_memory, POOL_INTERN))) - out_of_memory(msg); + flist->prev = first_flist->prev; + flist->prev->next = first_flist->prev = flist; + } + flist->pool_boundary = pool_boundary(flist->file_pool, 0); + flist_cnt++; } -#endif return flist; } -/* - * free up all elements in a flist - */ +/* Free up all elements in a flist. */ void flist_free(struct file_list *flist) { - pool_destroy(flist->file_pool); - pool_destroy(flist->hlink_pool); + if (!flist->prev) { + /* Was FLIST_TEMP dir-list. */ + } else if (flist == flist->prev) { + first_flist = cur_flist = NULL; + file_total = 0; + flist_cnt = 0; + } else { + if (flist == cur_flist) + cur_flist = flist->next; + if (flist == first_flist) + first_flist = first_flist->next; + else { + flist->prev->next = flist->next; + if (!flist->next) + flist->next = first_flist; + } + flist->next->prev = flist->prev; + file_total -= flist->used; + flist_cnt--; + } + + 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 (flist->files[i]->basename) { - 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 (!file->basename) + 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; @@ -1576,34 +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 keep = j, drop = i; - 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_DEL_HERE); - clear_file(flist->files[drop], flist); + 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 && !flist->files[j]->basename; + j < i && !F_IS_ACTIVE(flist->sorted[j]); j++) {} flist->low = j; } @@ -1612,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; @@ -1629,67 +2361,67 @@ 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 dir.depth value for a + /* This temporarily abuses the F_DEPTH() value for a * directory that is in a chain that might get pruned. * We restore the old value if it gets a reprieve. */ - if (S_ISDIR(file->mode) && file->dir.depth) { + if (S_ISDIR(file->mode) && F_DEPTH(file)) { /* Dump empty dirs when coming back down. */ - for (j = prev_depth; j >= file->dir.depth; j--) { - fp = flist->files[prev_i]; - if (fp->dir.depth >= 0) + for (j = prev_depth; j >= F_DEPTH(file); j--) { + fp = flist->sorted[prev_i]; + if (F_DEPTH(fp) >= 0) break; - prev_i = -fp->dir.depth-1; - clear_file(fp, flist); + prev_i = -F_DEPTH(fp)-1; + clear_file(fp); } - prev_depth = file->dir.depth; + prev_depth = F_DEPTH(file); if (is_excluded(f_name(file, fbuf), 1, ALL_FILTERS)) { /* Keep dirs through this dir. */ for (j = prev_depth-1; ; j--) { - fp = flist->files[prev_i]; - if (fp->dir.depth >= 0) + fp = flist->sorted[prev_i]; + if (F_DEPTH(fp) >= 0) break; - prev_i = -fp->dir.depth-1; - fp->dir.depth = j; + prev_i = -F_DEPTH(fp)-1; + F_DEPTH(fp) = j; } } else - file->dir.depth = -prev_i-1; + F_DEPTH(file) = -prev_i-1; prev_i = i; } else { /* Keep dirs through this non-dir. */ for (j = prev_depth; ; j--) { - fp = flist->files[prev_i]; - if (fp->dir.depth >= 0) + fp = flist->sorted[prev_i]; + if (F_DEPTH(fp) >= 0) break; - prev_i = -fp->dir.depth-1; - fp->dir.depth = j; + prev_i = -F_DEPTH(fp)-1; + F_DEPTH(fp) = j; } } } - /* Dump empty all remaining empty dirs. */ + /* Dump all remaining empty dirs. */ while (1) { - struct file_struct *fp = flist->files[prev_i]; - if (fp->dir.depth >= 0) + struct file_struct *fp = flist->sorted[prev_i]; + if (F_DEPTH(fp) >= 0) break; - prev_i = -fp->dir.depth-1; - clear_file(fp, flist); + prev_i = -F_DEPTH(fp)-1; + clear_file(fp); } for (i = flist->low; i <= flist->high; i++) { - if (flist->files[i]->basename) + if (F_IS_ACTIVE(flist->sorted[i])) break; } flist->low = i; for (i = flist->high; i >= flist->low; i--) { - if (flist->files[i]->basename) + if (F_IS_ACTIVE(flist->sorted[i])) break; } flist->high = i; @@ -1700,33 +2432,52 @@ static void output_flist(struct file_list *flist) { char uidbuf[16], gidbuf[16], depthbuf[16]; struct file_struct *file; + const char *root, *dir, *slash, *name, *trail; const char *who = who_am_i(); int i; - 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)file->uid); - else + 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 && file->gid != GID_NONE) - snprintf(gidbuf, sizeof gidbuf, " gid=%ld", (long)file->gid); - else + 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", file->dir.depth); - rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n", - who, i, am_sender ? NS(file->dir.root) : depthbuf, - file->dirname ? file->dirname : "", - file->dirname ? "/" : "", NS(file->basename), - S_ISDIR(file->mode) ? "/" : "", (int)file->mode, - (double)file->length, uidbuf, gidbuf, file->flags); + snprintf(depthbuf, sizeof depthbuf, "%d", F_DEPTH(file)); + if (F_IS_ACTIVE(file)) { + root = am_sender ? NS(F_PATHNAME(file)) : depthbuf; + if ((dir = file->dirname) == NULL) + dir = slash = ""; + else + slash = "/"; + name = file->basename; + 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 + 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. * @@ -1742,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; @@ -1750,12 +2501,12 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) enum fnc_type type1, type2; enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM; - if (!f1 || !f1->basename) { - if (!f2 || !f2->basename) + if (!f1 || !F_IS_ACTIVE(f1)) { + if (!f2 || !F_IS_ACTIVE(f2)) return 0; return -1; } - if (!f2 || !f2->basename) + if (!f2 || !F_IS_ACTIVE(f2)) return 1; c1 = (uchar*)f1->dirname; @@ -1764,7 +2515,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) c1 = c2 = NULL; if (!c1) { type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; - c1 = (uchar*)f1->basename; + c1 = (const uchar*)f1->basename; if (type1 == t_PATH && *c1 == '.' && !c1[1]) { type1 = t_ITEM; state1 = s_TRAILING; @@ -1777,7 +2528,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) } if (!c2) { type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; - c2 = (uchar*)f2->basename; + c2 = (const uchar*)f2->basename; if (type2 == t_PATH && *c2 == '.' && !c2[1]) { type2 = t_ITEM; state2 = s_TRAILING; @@ -1801,7 +2552,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) break; case s_SLASH: type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; - c1 = (uchar*)f1->basename; + c1 = (const uchar*)f1->basename; if (type1 == t_PATH && *c1 == '.' && !c1[1]) { type1 = t_ITEM; state1 = s_TRAILING; @@ -1831,7 +2582,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) break; case s_SLASH: type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; - c2 = (uchar*)f2->basename; + c2 = (const uchar*)f2->basename; if (type2 == t_PATH && *c2 == '.' && !c2[1]) { type2 = t_ITEM; state2 = s_TRAILING; @@ -1847,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; @@ -1860,23 +2612,37 @@ 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]; + static unsigned int n; + + n = (n + 1) % (sizeof names / sizeof names[0]); + + return names[n]; +} + /* Return a copy of the full filename of a flist entry, using the indicated * 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->basename) + if (!f || !F_IS_ACTIVE(f)) return NULL; - if (!fbuf) { - static char names[5][MAXPATHLEN]; - static unsigned int n; - - n = (n + 1) % (sizeof names / sizeof names[0]); - - fbuf = names[n]; - } + if (!fbuf) + fbuf = f_name_buf(); if (f->dirname) { int len = strlen(f->dirname); @@ -1894,13 +2660,13 @@ char *f_name(struct file_struct *f, char *fbuf) * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN * buffer (the functions we call will append names onto the end, but the old * dir value will be restored on exit). */ -struct file_list *get_dirlist(char *dirname, int dlen, - int ignore_filter_rules) +struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) { struct file_list *dirlist; 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); @@ -1909,17 +2675,20 @@ struct file_list *get_dirlist(char *dirname, int dlen, dirname = dirbuf; } - dirlist = flist_new(WITHOUT_HLINK, "get_dirlist"); + dirlist = flist_new(FLIST_TEMP, "get_dirlist"); recurse = 0; xfer_dirs = 1; - send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen); + 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);