X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6f0805f564a5f11e7e93d0b74ee907641c748d5b..62a6b8df72d18f0b13462ee7ac33f9a8a46ef0b5:/flist.c diff --git a/flist.c b/flist.c index 1452d6c6..960e6a11 100644 --- a/flist.c +++ b/flist.c @@ -63,6 +63,9 @@ extern int copy_links; extern int copy_unsafe_links; extern int protocol_version; extern int sanitize_paths; +extern int munge_symlinks; +extern int need_unsorted_flist; +extern int unsort_ndx; extern struct stats stats; extern char *filesfrom_host; @@ -74,9 +77,7 @@ 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 @@ -87,11 +88,15 @@ int checksum_len; dev_t filesystem_dev; /* used to implement -x */ struct file_list *cur_flist, *first_flist, *dir_flist; -int send_dir_ndx = -1, send_dir_depth = 0; +int send_dir_ndx = -1, send_dir_depth = -1; int flist_cnt = 0; /* how many (non-tmp) file list objects exist */ int file_total = 0; /* total of all active items over all file-lists */ int flist_eof = 0; /* all the file-lists are now known */ +#define NORMAL_NAME 0 +#define SLASH_ENDING_NAME 1 +#define DOT_NAME 2 + /* Starting from protocol version 26, we always use 64-bit ino_t and dev_t * internally, even if this platform does not allow files to have 64-bit inums. * The only exception is if we're on a platform with no 64-bit type at all. @@ -116,9 +121,8 @@ 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); +static void flist_sort_and_clean(struct file_list *flist, int strip_root); static void output_flist(struct file_list *flist); void init_flist(void) @@ -196,6 +200,11 @@ static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf) } return x_stat(path, stp, NULL); } + if (munge_symlinks && am_sender && llen > SYMLINK_PREFIX_LEN + && strncmp(linkbuf, SYMLINK_PREFIX, SYMLINK_PREFIX_LEN) == 0) { + memmove(linkbuf, linkbuf + SYMLINK_PREFIX_LEN, + llen - SYMLINK_PREFIX_LEN + 1); + } } return 0; #else @@ -335,12 +344,14 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ { static time_t modtime; static mode_t mode; +#ifdef SUPPORT_HARD_LINKS static int64 dev; +#endif static dev_t rdev; static uint32 rdev_major; static uid_t uid; static gid_t gid; - static char *user_name, *group_name; + static const char *user_name, *group_name; static char lastname[MAXPATHLEN]; char fname[MAXPATHLEN]; int first_hlink_ndx = -1; @@ -376,16 +387,23 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ #endif f_name(file, fname); - xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ + /* Initialize starting value of xflags. */ + if (protocol_version >= 30 && S_ISDIR(file->mode)) { + dir_count++; + if (file->flags & FLAG_CONTENT_DIR) + xflags = file->flags & FLAG_TOP_DIR; + else if (file->flags & FLAG_IMPLIED_DIR) + xflags = XMIT_TOP_DIR | XMIT_NO_CONTENT_DIR; + else + xflags = XMIT_NO_CONTENT_DIR; + } else + xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ if (file->mode == mode) xflags |= XMIT_SAME_MODE; else mode = file->mode; - if (protocol_version >= 30 && S_ISDIR(mode) && !(file->flags & FLAG_XFER_DIR)) - xflags |= XMIT_NON_XFER_DIR; - if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { if (protocol_version < 28) { @@ -439,8 +457,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ 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); + np->data = (void*)(long)(first_ndx + ndx + 1); xflags |= XMIT_HLINK_FIRST; } xflags |= XMIT_HLINKED; @@ -593,7 +610,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, { static int64 modtime; static mode_t mode; +#ifdef SUPPORT_HARD_LINKS static int64 dev; +#endif static dev_t rdev; static uint32 rdev_major; static uid_t uid; @@ -657,7 +676,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, clean_fname(thisname, 0); if (sanitize_paths) - sanitize_path(thisname, thisname, "", 0, NULL); + sanitize_path(thisname, thisname, "", 0); if ((basename = strrchr(thisname, '/')) != NULL) { int len = basename++ - thisname; @@ -711,8 +730,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, 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, + if (!am_generator && (int64)(time_t)modtime != modtime) { + rprintf(FERROR_XFER, "Time value of %s truncated on receiver.\n", lastname); } @@ -780,6 +799,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, linkname_len - 1); overflow_exit("recv_file_entry"); } + if (munge_symlinks) + linkname_len += SYMLINK_PREFIX_LEN; } else #endif @@ -807,11 +828,6 @@ static struct file_struct *recv_file_entry(struct file_list *flist, 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 */ @@ -821,6 +837,11 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } else pool = flist->file_pool; +#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; bp = pool_alloc(pool, alloc_len, "recv_file_entry"); @@ -850,10 +871,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, F_GROUP(file) = gid; file->flags |= gid_flags; } -#ifdef ICONV_OPTION - if (ic_ndx) + if (unsort_ndx) F_NDX(file) = flist->used + flist->ndx_start; -#endif if (basename != thisname) { file->dirname = lastdir; @@ -864,22 +883,26 @@ 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 (xflags & XMIT_TOP_DIR) { + if (protocol_version >= 30) { + if (!(xflags & XMIT_NO_CONTENT_DIR)) { + if (xflags & XMIT_TOP_DIR) + file->flags |= FLAG_TOP_DIR; + file->flags |= FLAG_CONTENT_DIR; + } else if (xflags & XMIT_TOP_DIR) + file->flags |= FLAG_IMPLIED_DIR; + } else if (xflags & XMIT_TOP_DIR) { in_del_hier = recurse; del_hier_name_len = F_DEPTH(file) == 0 ? 0 : l1 + l2; if (relative_paths && del_hier_name_len > 2 && lastname[del_hier_name_len-1] == '.' && lastname[del_hier_name_len-2] == '/') del_hier_name_len -= 2; - file->flags |= FLAG_TOP_DIR | FLAG_XFER_DIR; - } else if (protocol_version >= 30) { - if (!(xflags & XMIT_NON_XFER_DIR)) - file->flags |= FLAG_XFER_DIR; + file->flags |= FLAG_TOP_DIR | FLAG_CONTENT_DIR; } else if (in_del_hier) { if (!relative_paths || !del_hier_name_len || (l1 >= del_hier_name_len && lastname[del_hier_name_len] == '/')) - file->flags |= FLAG_XFER_DIR; + file->flags |= FLAG_CONTENT_DIR; else in_del_hier = 0; } @@ -898,10 +921,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist, 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 + } else if (munge_symlinks) { + strlcpy(bp, SYMLINK_PREFIX, linkname_len); + bp += SYMLINK_PREFIX_LEN; + linkname_len -= SYMLINK_PREFIX_LEN; + read_sbuf(f, bp, linkname_len - 1); + } else { read_sbuf(f, bp, linkname_len - 1); - if (sanitize_paths) - sanitize_path(bp, bp, "", lastdir_depth, NULL); + if (sanitize_paths) + sanitize_path(bp, bp, "", lastdir_depth); + } } #endif @@ -909,8 +938,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, 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; + F_HL_GNUM(file) = flist->ndx_start + flist->used; } else F_HL_GNUM(file) = first_hlink_ndx; } else { @@ -992,7 +1020,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, } clean_fname(thisname, 0); if (sanitize_paths) - sanitize_path(thisname, thisname, "", 0, NULL); + sanitize_path(thisname, thisname, "", 0); if (stp && S_ISDIR(stp->st_mode)) { st = *stp; /* Needed for "symlink/." with --relative. */ @@ -1013,20 +1041,20 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, 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", + rprintf(FERROR_XFER, "symlink has no referent: %s\n", full_fname(thisname)); } else #endif { enum logcode c = am_daemon && protocol_version < 28 - ? FERROR : FINFO; + ? FERROR : FWARNING; io_error |= IOERR_VANISHED; rprintf(c, "file has vanished: %s\n", full_fname(thisname)); } } else { io_error |= IOERR_GENERAL; - rsyserr(FERROR, save_errno, "readlink %s failed", + rsyserr(FERROR_XFER, save_errno, "readlink %s failed", full_fname(thisname)); } return NULL; @@ -1041,26 +1069,24 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, rprintf(FINFO, "skipping directory %s\n", thisname); return NULL; } - } else - flags &= ~FLAG_XFER_DIR; - - /* -x only affects directories because we need to avoid recursing - * into a mount-point directory, not to avoid copying a symlinked - * file if -L (or similar) was specified. */ - if (one_file_system && S_ISDIR(st.st_mode)) { - if (flags & FLAG_TOP_DIR) - filesystem_dev = st.st_dev; - else if (st.st_dev != filesystem_dev) { + /* -x only affects dirs because we need to avoid recursing + * into a mount-point directory, not to avoid copying a + * symlinked file if -L (or similar) was specified. */ + if (one_file_system && st.st_dev != filesystem_dev + && BITS_SETnUNSET(flags, FLAG_CONTENT_DIR, FLAG_TOP_DIR)) { if (one_file_system > 1) { - if (verbose > 2) { - rprintf(FINFO, "skipping mount-point dir %s\n", - thisname); + if (verbose > 1) { + rprintf(FINFO, + "[%s] skipping mount-point dir %s\n", + who_am_i(), thisname); } return NULL; } flags |= FLAG_MOUNT_DIR; + flags &= ~FLAG_CONTENT_DIR; } - } + } else + flags &= ~FLAG_CONTENT_DIR; if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) { if (ignore_perishable) @@ -1086,7 +1112,6 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, extra_len += DIRNODE_EXTRA_CNT * EXTRA_LEN; if (relative_paths) extra_len += PTR_EXTRA_CNT * EXTRA_LEN; - dir_count++; pool = dir_flist->file_pool; } else pool = flist->file_pool; @@ -1207,13 +1232,14 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, file->mode = save_mode; } - if (basename_len == 0+1) + if (basename_len == 0+1) { + if (!pool) + unmake_file(file); return NULL; + } -#ifdef ICONV_OPTION - if (ic_ndx) - F_NDX(file) = dir_count - 1; -#endif + if (unsort_ndx) + F_NDX(file) = dir_count; return file; } @@ -1235,7 +1261,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist, { struct file_struct *file; #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS - statx sx; + stat_x sx; #endif file = make_file(fname, flist, stp, flags, filter_level); @@ -1298,7 +1324,7 @@ static void send_if_directory(int f, struct file_list *flist, fbuf[--len] = '\0'; if (len >= MAXPATHLEN - 1) { io_error |= IOERR_GENERAL; - rprintf(FERROR, "skipping long-named directory: %s\n", + rprintf(FERROR_XFER, "skipping long-named directory: %s\n", full_fname(fbuf)); return; } @@ -1399,7 +1425,7 @@ static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist, dir_flist->files[dir_flist->used++] = file; dir_cnt--; - if (file->flags & FLAG_MOUNT_DIR) + if (file->basename[0] == '.' && file->basename[1] == '\0') continue; if (dp) @@ -1437,7 +1463,7 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len, if (!(d = opendir(fbuf))) { io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "opendir %s failed", full_fname(fbuf)); + rsyserr(FERROR_XFER, errno, "opendir %s failed", full_fname(fbuf)); return; } @@ -1474,7 +1500,7 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len, if (errno) { io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "readdir(%s)", full_fname(fbuf)); + rsyserr(FERROR_XFER, errno, "readdir(%s)", full_fname(fbuf)); } closedir(d); @@ -1492,14 +1518,15 @@ static int lastpath_len = 0; static struct file_struct *lastpath_struct; static void send_implied_dirs(int f, struct file_list *flist, char *fname, - char *start, char *limit, int flags, int is_dot_dir) + char *start, char *limit, int flags, char name_type) { struct file_struct *file; - item_list *rel_list; - char **ep, *slash; + item_list *relname_list; + relnamecache **rnpp; + char *slash; int len, need_new_dir; - flags &= ~FLAG_XFER_DIR; + flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR); if (inc_recurse) { if (lastpath_struct && F_PATHNAME(lastpath_struct) == pathname @@ -1548,24 +1575,24 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname, return; /* dir must have vanished */ len = strlen(limit+1); - memcpy(&rel_list, F_DIR_RELS_P(lastpath_struct), sizeof rel_list); - if (!rel_list) { - if (!(rel_list = new0(item_list))) + memcpy(&relname_list, F_DIR_RELNAMES_P(lastpath_struct), sizeof relname_list); + if (!relname_list) { + if (!(relname_list = new0(item_list))) out_of_memory("send_implied_dirs"); - memcpy(F_DIR_RELS_P(lastpath_struct), &rel_list, sizeof rel_list); + memcpy(F_DIR_RELNAMES_P(lastpath_struct), &relname_list, sizeof relname_list); } - ep = EXPAND_ITEM_LIST(rel_list, char *, 32); - if (!(*ep = new_array(char, 1 + len + 1))) + rnpp = EXPAND_ITEM_LIST(relname_list, relnamecache *, 32); + if (!(*rnpp = (relnamecache*)new_array(char, sizeof (relnamecache) + len))) out_of_memory("send_implied_dirs"); - **ep = is_dot_dir; - strlcpy(*ep + 1, limit+1, len + 1); + (*rnpp)->name_type = name_type; + strlcpy((*rnpp)->fname, limit+1, len + 1); } static void send1extra(int f, struct file_struct *file, struct file_list *flist) { char fbuf[MAXPATHLEN]; - item_list *rel_list; - int len, dlen, flags = FLAG_DIVERT_DIRS | FLAG_XFER_DIR; + item_list *relname_list; + int len, dlen, flags = FLAG_DIVERT_DIRS | FLAG_CONTENT_DIR; size_t j; f_name(file, fbuf); @@ -1578,70 +1605,76 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist) change_local_filter_dir(fbuf, dlen, send_dir_depth); - if (file->flags & FLAG_XFER_DIR) + if (file->flags & FLAG_CONTENT_DIR) { + if (one_file_system) { + STRUCT_STAT st; + if (link_stat(fbuf, &st, copy_dirlinks) != 0) { + io_error |= IOERR_GENERAL; + rsyserr(FERROR_XFER, errno, "link_stat %s failed", + full_fname(fbuf)); + return; + } + filesystem_dev = st.st_dev; + } send_directory(f, flist, fbuf, dlen, flags); + } if (!relative_paths) return; - memcpy(&rel_list, F_DIR_RELS_P(file), sizeof rel_list); - if (!rel_list) + memcpy(&relname_list, F_DIR_RELNAMES_P(file), sizeof relname_list); + if (!relname_list) return; - for (j = 0; j < rel_list->count; j++) { - char *slash, *ep = ((char**)rel_list->items)[j]; - int is_dot_dir = *ep; + for (j = 0; j < relname_list->count; j++) { + char *slash; + relnamecache *rnp = ((relnamecache**)relname_list->items)[j]; + char name_type = rnp->name_type; fbuf[dlen] = '/'; - len = strlcpy(fbuf + dlen + 1, ep+1, sizeof fbuf - dlen - 1); - free(ep); + len = strlcpy(fbuf + dlen + 1, rnp->fname, sizeof fbuf - dlen - 1); + free(rnp); if (len >= (int)sizeof fbuf) continue; /* Impossible... */ slash = strchr(fbuf+dlen+1, '/'); if (slash) { - send_implied_dirs(f, flist, fbuf, fbuf+dlen+1, slash, flags, is_dot_dir); + send_implied_dirs(f, flist, fbuf, fbuf+dlen+1, slash, flags, name_type); continue; } - if (is_dot_dir) { + if (name_type != NORMAL_NAME) { STRUCT_STAT st; - if (link_stat(fbuf, &st, copy_dirlinks) != 0) { + if (link_stat(fbuf, &st, 1) != 0) { io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "link_stat %s failed", + rsyserr(FERROR_XFER, errno, "link_stat %s failed", full_fname(fbuf)); continue; } - send_file_name(f, flist, fbuf, &st, - recurse || xfer_dirs ? FLAG_TOP_DIR | flags : flags, - ALL_FILTERS); - } else { - send_file_name(f, flist, fbuf, NULL, - recurse ? FLAG_TOP_DIR | flags : flags, - ALL_FILTERS); - } + send_file_name(f, flist, fbuf, &st, FLAG_TOP_DIR | flags, ALL_FILTERS); + } else + send_file_name(f, flist, fbuf, NULL, FLAG_TOP_DIR | flags, ALL_FILTERS); } - free(rel_list); + free(relname_list); } void send_extra_file_list(int f, int at_least) { struct file_list *flist; int64 start_write; - int future_cnt, save_io_error = io_error; + uint16 prev_flags; + int old_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) { + old_cnt = cur_flist->used; + for (flist = first_flist; flist != cur_flist; flist = flist->next) + old_cnt += flist->used; + while (file_total - old_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); @@ -1650,16 +1683,15 @@ void send_extra_file_list(int f, int at_least) flist = flist_new(0, "send_extra_file_list"); start_write = stats.total_written; -#ifdef ICONV_OPTION - if (ic_ndx) + if (unsort_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); + prev_flags = file->flags; dp = F_DIR_NODE_P(file); /* If there are any duplicate directory names that follow, we @@ -1669,33 +1701,30 @@ void send_extra_file_list(int f, int at_least) && dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) { send_dir_ndx = dir_ndx; file = dir_flist->sorted[dir_ndx]; - if (F_PATHNAME(file) != pathname) - send1extra(f, file, flist); + /* Try to avoid some duplicate scanning of identical dirs. */ + if (F_PATHNAME(file) == pathname && prev_flags & FLAG_CONTENT_DIR) + file->flags &= ~FLAG_CONTENT_DIR; + send1extra(f, file, flist); + prev_flags = file->flags; dp = F_DIR_NODE_P(file); } 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); + flist_sort_and_clean(flist, 0); 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) @@ -1736,7 +1765,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) struct timeval start_tv, end_tv; int64 start_write; int use_ff_fd = 0; - int flags, disable_buffering; + int disable_buffering; + int flags = recurse ? FLAG_CONTENT_DIR : 0; int reading_remotely = filesfrom_host != NULL; int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS) #ifdef ICONV_OPTION @@ -1753,6 +1783,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) start_write = stats.total_written; gettimeofday(&start_tv, NULL); + if (relative_paths && protocol_version >= 30) + implied_dirs = 1; /* We send flagged implied dirs */ + #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && protocol_version >= 30 && !cur_flist) init_hard_links(); @@ -1761,16 +1794,14 @@ 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 | FLAG_XFER_DIR; - } else { + flags |= FLAG_DIVERT_DIRS; + } else dir_flist = cur_flist; - flags = FLAG_XFER_DIR; - } disable_buffering = io_start_buffering_out(f); if (filesfrom_fd >= 0) { if (argv[0] && !push_dir(argv[0], 0)) { - rsyserr(FERROR, errno, "push_dir %s failed in %s", + rsyserr(FERROR_XFER, errno, "push_dir %s failed in %s", full_fname(argv[0]), curr_dir); exit_cleanup(RERR_FILESELECT); } @@ -1778,26 +1809,24 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } while (1) { - char fbuf[MAXPATHLEN]; - char *fn; - int is_dot_dir; + char fbuf[MAXPATHLEN], *fn, name_type; if (use_ff_fd) { if (read_line(filesfrom_fd, fbuf, sizeof fbuf, rl_flags) == 0) break; - sanitize_path(fbuf, fbuf, "", 0, NULL); + sanitize_path(fbuf, fbuf, "", 0); } else { if (argc-- == 0) break; strlcpy(fbuf, *argv++, MAXPATHLEN); if (sanitize_paths) - sanitize_path(fbuf, fbuf, "", 0, NULL); + sanitize_path(fbuf, fbuf, "", 0); } len = strlen(fbuf); if (relative_paths) { /* We clean up fbuf below. */ - is_dot_dir = 0; + name_type = NORMAL_NAME; } else if (!len || fbuf[len - 1] == '/') { if (len == 2 && fbuf[0] == '.') { /* Turn "./" into just "." rather than "./." */ @@ -1808,7 +1837,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) fbuf[len++] = '.'; fbuf[len] = '\0'; } - is_dot_dir = 1; + name_type = DOT_NAME; } else if (len > 1 && fbuf[len-1] == '.' && fbuf[len-2] == '.' && (len == 2 || fbuf[len-3] == '/')) { if (len + 2 >= MAXPATHLEN) @@ -1816,11 +1845,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) fbuf[len++] = '/'; fbuf[len++] = '.'; fbuf[len] = '\0'; - is_dot_dir = 1; - } else { - is_dot_dir = fbuf[len-1] == '.' - && (len == 1 || fbuf[len-2] == '/'); - } + name_type = DOT_NAME; + } else if (fbuf[len-1] == '.' && (len == 1 || fbuf[len-2] == '/')) + name_type = DOT_NAME; + else + name_type = NORMAL_NAME; dir = NULL; @@ -1843,39 +1872,37 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) dir = "/"; else dir = fbuf; - len -= p - fbuf + 3; fn = p + 3; + while (*fn == '/') + fn++; + if (!*fn) + *--fn = '\0'; /* ensure room for '.' */ } else fn = fbuf; - /* Get rid of trailing "/" and "/.". */ - while (len) { - if (fn[len - 1] == '/') { - is_dot_dir = 1; - if (!--len && !dir) { - len++; - break; - } - } - else if (len >= 2 && fn[len - 1] == '.' - && fn[len - 2] == '/') { - is_dot_dir = 1; - if (!(len -= 2) && !dir) { - len++; - break; - } - } else - break; + len = clean_fname(fn, CFN_KEEP_LEADING_DOT_DIR + | CFN_KEEP_TRAILING_SLASH + | CFN_DROP_TRAILING_DOT_DIR); + if (len == 1) { + if (fn[0] == '/') { + fn = "/."; + len = 2; + name_type = DOT_NAME; + } else if (fn[0] == '.') + name_type = DOT_NAME; + } else if (fn[len-1] == '/') { + fn[--len] = '\0'; + if (len == 1 && *fn == '.') + name_type = DOT_NAME; + else + name_type = SLASH_ENDING_NAME; } - if (len == 1 && fn[0] == '/') - fn[len++] = '.'; - fn[len] = '\0'; /* Reject a ".." dir in the active part of the path. */ for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) { if ((p[2] == '/' || p[2] == '\0') && (p == fn || p[-1] == '/')) { rprintf(FERROR, "found \"..\" dir in relative path: %s\n", - fbuf); + fn); exit_cleanup(RERR_SYNTAX); } } @@ -1884,6 +1911,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (!*fn) { len = 1; fn = "."; + name_type = DOT_NAME; } dirlen = dir ? strlen(dir) : 0; @@ -1898,9 +1926,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (fn != fbuf) memmove(fbuf, fn, len + 1); - if (link_stat(fbuf, &st, copy_dirlinks) != 0) { + if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0) { io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "link_stat %s failed", + rsyserr(FERROR_XFER, errno, "link_stat %s failed", full_fname(fbuf)); continue; } @@ -1912,8 +1940,14 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (inc_recurse && relative_paths && *fbuf) { if ((p = strchr(fbuf+1, '/')) != NULL) { - send_implied_dirs(f, flist, fbuf, fbuf, p, flags, is_dot_dir); - continue; + if (p - fbuf == 1 && *fbuf == '.') { + if ((fn = strchr(p+1, '/')) != NULL) + p = fn; + } else + fn = p; + send_implied_dirs(f, flist, fbuf, fbuf, p, flags, name_type); + if (fn == p) + continue; } } else if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) { /* Send the implied directories at the start of the @@ -1931,12 +1965,23 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) send_implied_dirs(f, flist, fbuf, slash, p, flags, 0); } - if (recurse || (xfer_dirs && is_dot_dir)) { + if (one_file_system) + filesystem_dev = st.st_dev; + + if (recurse || (xfer_dirs && name_type != NORMAL_NAME)) { struct file_struct *file; - int top_flags = FLAG_TOP_DIR | flags; + int top_flags = FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags; file = send_file_name(f, flist, fbuf, &st, top_flags, ALL_FILTERS); - if (file && !inc_recurse) + if (inc_recurse) { + if (name_type == DOT_NAME && file) { + if (send_dir_depth < 0) { + send_dir_depth = 0; + change_local_filter_dir(fbuf, len, send_dir_depth); + } + send_directory(f, flist, fbuf, len, flags); + } + } else if (file) send_if_directory(f, flist, file, fbuf, len, flags); } else send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS); @@ -1971,31 +2016,16 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) * 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; - } + 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*)); } else -#endif - { flist->sorted = flist->files; - clean_flist(flist, 0); - } + flist_sort_and_clean(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_id_list(f); @@ -2018,7 +2048,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) rprintf(FINFO, "send_file_list done\n"); if (inc_recurse) { + send_dir_depth = 1; add_dirs_to_tree(-1, flist, dir_count); + if (!file_total || strcmp(flist->sorted[0]->basename, ".") != 0) + flist->parent_ndx = -1; flist_done_allocating(flist); if (send_dir_ndx < 0) { write_ndx(f, NDX_FLIST_EOF); @@ -2058,7 +2091,7 @@ struct file_list *recv_file_list(int f) flist = flist_new(0, "recv_file_list"); if (inc_recurse) { - if (flist->ndx_start == 0) + if (flist->ndx_start == 1) dir_flist = flist_new(FLIST_TEMP, "recv_file_list"); dstart = dir_flist->used; } else { @@ -2091,17 +2124,12 @@ struct file_list *recv_file_list(int f) } 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->used); if (show_filelist_p()) finish_filelist_progress(flist); -#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 @@ -2113,16 +2141,18 @@ struct file_list *recv_file_list(int f) 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); + static int dir_flist_malloced = 0; + if (dir_flist_malloced < dir_flist->malloced) { + dir_flist->sorted = realloc_array(dir_flist->sorted, + struct file_struct *, + dir_flist->malloced); + dir_flist_malloced = dir_flist->malloced; + } 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 - { + } else { flist->sorted = flist->files; if (inc_recurse && dir_flist->used > dstart) { dir_flist->sorted = dir_flist->files; @@ -2135,7 +2165,7 @@ struct file_list *recv_file_list(int f) else if (f >= 0) recv_id_list(f, flist); - clean_flist(flist, relative_paths); + flist_sort_and_clean(flist, relative_paths); if (protocol_version < 30) { /* Recv the io_error flag */ @@ -2143,6 +2173,9 @@ struct file_list *recv_file_list(int f) read_int(f); else io_error |= read_int(f); + } else if (inc_recurse && flist->ndx_start == 1) { + if (!file_total || strcmp(flist->sorted[0]->basename, ".") != 0) + flist->parent_ndx = -1; } if (verbose > 3) @@ -2272,16 +2305,19 @@ struct file_list *flist_new(int flags, char *msg) if (!flist->file_pool) out_of_memory(msg); + flist->ndx_start = flist->flist_num = inc_recurse ? 1 : 0; + first_flist = cur_flist = flist->prev = flist; } else { + struct file_list *prev = first_flist->prev; + 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->ndx_start = prev->ndx_start + prev->used + 1; + flist->flist_num = prev->flist_num + 1; - flist->prev = first_flist->prev; - flist->prev->next = first_flist->prev = flist; + flist->prev = prev; + prev->next = first_flist->prev = flist; } flist->pool_boundary = pool_boundary(flist->file_pool, 0); flist_cnt++; @@ -2327,7 +2363,7 @@ void flist_free(struct file_list *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) +static void flist_sort_and_clean(struct file_list *flist, int strip_root) { char fbuf[MAXPATHLEN]; int i, prev_i; @@ -2385,6 +2421,10 @@ static void clean_flist(struct file_list *flist, int strip_root) else { if (am_sender) file->flags |= FLAG_DUPLICATE; + else { /* Make sure we merge our vital flags. */ + fp->flags |= file->flags & (FLAG_TOP_DIR|FLAG_CONTENT_DIR); + fp->flags &= file->flags | ~FLAG_IMPLIED_DIR; + } keep = j, drop = i; } } else @@ -2396,11 +2436,6 @@ static void clean_flist(struct file_list *flist, int strip_root) "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]); } @@ -2508,10 +2543,10 @@ static void output_flist(struct file_list *flist) const char *who = who_am_i(); int i; - 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); + rprintf(FINFO, "[%s] flist start=%d, used=%d, low=%d, high=%d\n", + who, flist->ndx_start, flist->used, flist->low, flist->high); for (i = 0; i < flist->used; i++) { - file = flist->sorted[i]; + file = flist->files[i]; if ((am_root || am_sender) && uid_ndx) { snprintf(uidbuf, sizeof uidbuf, " uid=%u", F_OWNER(file)); @@ -2759,7 +2794,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) prune_empty_dirs = 0; dirlist->sorted = dirlist->files; - clean_flist(dirlist, 0); + flist_sort_and_clean(dirlist, 0); prune_empty_dirs = save_prune_empty_dirs; if (verbose > 3)