X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e6d05dcfca5585317808826186ca4d06e2d2eaa5..b3bf9b9df95137a3a43248be9599d919b04877af:/flist.c diff --git a/flist.c b/flist.c index 732c2420..2e449c0b 100644 --- a/flist.c +++ b/flist.c @@ -4,7 +4,7 @@ * Copyright (C) 1996 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2002-2007 Wayne Davison + * Copyright (C) 2002-2009 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 @@ -23,16 +23,15 @@ #include "rsync.h" #include "ifuncs.h" #include "rounding.h" +#include "inums.h" #include "io.h" -extern int verbose; 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; @@ -44,6 +43,8 @@ extern int filesfrom_fd; extern int one_file_system; extern int copy_dirlinks; extern int keep_dirlinks; +extern int preserve_uid; +extern int preserve_gid; extern int preserve_acls; extern int preserve_xattrs; extern int preserve_links; @@ -65,16 +66,20 @@ extern int protocol_version; extern int sanitize_paths; extern int munge_symlinks; extern int need_unsorted_flist; +extern int sender_symlink_iconv; +extern int output_needs_newline; +extern int sender_keeps_checksum; extern int unsort_ndx; extern struct stats stats; extern char *filesfrom_host; +extern char *usermap, *groupmap; extern char curr_dir[MAXPATHLEN]; extern struct chmod_mode_struct *chmod_modes; extern struct filter_list_struct filter_list; -extern struct filter_list_struct server_filter_list; +extern struct filter_list_struct daemon_filter_list; #ifdef ICONV_OPTION extern int filesfrom_convert; @@ -95,7 +100,7 @@ int flist_eof = 0; /* all the file-lists are now known */ #define NORMAL_NAME 0 #define SLASH_ENDING_NAME 1 -#define DOT_NAME 2 +#define DOTDIR_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. @@ -120,14 +125,13 @@ 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 void flist_sort_and_clean(struct file_list *flist, int strip_root); static void output_flist(struct file_list *flist); void init_flist(void) { - if (verbose > 4) { + if (DEBUG_GTE(FLIST, 4)) { rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n", (int)FILE_STRUCT_LEN, (int)EXTRA_LEN); } @@ -138,14 +142,13 @@ void init_flist(void) static int show_filelist_p(void) { - return verbose && xfer_dirs && !am_server && !inc_recurse; + return INFO_GTE(FLIST, 1) && xfer_dirs && !am_server && !inc_recurse; } static void start_filelist_progress(char *kind) { rprintf(FCLIENT, "%s ... ", kind); - if (verbose > 1 || do_progress) - rprintf(FCLIENT, "\n"); + output_needs_newline = 1; rflush(FINFO); } @@ -156,18 +159,20 @@ static void emit_filelist_progress(int count) static void maybe_emit_filelist_progress(int count) { - if (do_progress && show_filelist_p() && (count % 100) == 0) + if (INFO_GTE(FLIST, 2) && show_filelist_p() && (count % 100) == 0) emit_filelist_progress(count); } static void finish_filelist_progress(const struct file_list *flist) { - if (do_progress) { + if (INFO_GTE(FLIST, 2)) { /* This overwrites the progress line */ rprintf(FINFO, "%d file%sto consider\n", flist->used, flist->used == 1 ? " " : "s "); - } else + } else { + output_needs_newline = 0; rprintf(FINFO, "done\n"); + } } void show_flist_stats(void) @@ -194,7 +199,7 @@ static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf) return -1; linkbuf[llen] = '\0'; if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) { - if (verbose > 1) { + if (INFO_GTE(SYMSAFE, 1)) { rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", path, linkbuf); } @@ -230,33 +235,57 @@ int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks) #endif } +static inline int is_daemon_excluded(const char *fname, int is_dir) +{ + if (daemon_filter_list.head + && check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) { + errno = ENOENT; + return 1; + } + return 0; +} + +static inline int path_is_daemon_excluded(char *path, int ignore_filename) +{ + if (daemon_filter_list.head) { + char *slash = path; + + while ((slash = strchr(slash+1, '/')) != NULL) { + int ret; + *slash = '\0'; + ret = check_filter(&daemon_filter_list, FLOG, path, 1); + *slash = '/'; + if (ret < 0) { + errno = ENOENT; + return 1; + } + } + + if (!ignore_filename + && check_filter(&daemon_filter_list, FLOG, path, 1) < 0) { + errno = ENOENT; + return 1; + } + } + + return 0; +} + /* This function is used to check if a file should be included/excluded * from the list of files based on its name and type etc. The value of * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */ -static int is_excluded(char *fname, int is_dir, int filter_level) +static int is_excluded(const char *fname, int is_dir, int filter_level) { #if 0 /* This currently never happens, so avoid a useless compare. */ if (filter_level == NO_FILTERS) return 0; #endif - if (fname) { - /* never exclude '.', even if somebody does --exclude '*' */ - if (fname[0] == '.' && !fname[1]) - return 0; - /* Handle the -R version of the '.' dir. */ - if (fname[0] == '/') { - int len = strlen(fname); - if (fname[len-1] == '.' && fname[len-2] == '/') - return 0; - } - } - if (server_filter_list.head - && check_filter(&server_filter_list, fname, is_dir) < 0) + if (is_daemon_excluded(fname, is_dir)) return 1; if (filter_level != ALL_FILTERS) return 0; if (filter_list.head - && check_filter(&filter_list, fname, is_dir) < 0) + && check_filter(&filter_list, FINFO, fname, is_dir) < 0) return 1; return 0; } @@ -267,7 +296,6 @@ static void send_directory(int f, struct file_list *flist, static const char *pathname, *orig_dir; static int pathname_len; - /* Make sure flist can hold at least flist->used + extra entries. */ static void flist_expand(struct file_list *flist, int extra) { @@ -291,10 +319,10 @@ static void flist_expand(struct file_list *flist, int 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 pointer array to %.0f bytes, did%s move\n", + if (DEBUG_GTE(FLIST, 1) && flist->malloced != FLIST_START) { + rprintf(FCLIENT, "[%s] expand file_list pointer array to %s bytes, did%s move\n", who_am_i(), - (double)sizeof flist->files[0] * flist->malloced, + big_num(sizeof flist->files[0] * flist->malloced), (new_ptr == flist->files) ? " not" : ""); } @@ -313,34 +341,59 @@ static void flist_done_allocating(struct file_list *flist) flist->pool_boundary = ptr; } -int push_pathname(const char *dir, int len) +/* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's + * F_PATHNAME(), or (2) "NULL, dir, dirlen" to chdir() to the supplied dir, + * with dir == NULL taken to be the starting directory, and dirlen < 0 + * indicating that strdup(dir) should be called and then the -dirlen length + * value checked to ensure that it is not daemon-excluded. */ +int change_pathname(struct file_struct *file, const char *dir, int dirlen) { - if (dir == pathname) - return 1; + if (dirlen < 0) { + char *cpy = strdup(dir); + if (*cpy != '/') + change_dir(orig_dir, CD_SKIP_CHDIR); + if (path_is_daemon_excluded(cpy, 0)) + goto chdir_error; + dir = cpy; + dirlen = -dirlen; + } else { + if (file) { + if (pathname == F_PATHNAME(file)) + return 1; + dir = F_PATHNAME(file); + if (dir) + dirlen = strlen(dir); + } else if (pathname == dir) + return 1; + if (dir && *dir != '/') + change_dir(orig_dir, CD_SKIP_CHDIR); + } - if (!orig_dir) - orig_dir = strdup(curr_dir); + pathname = dir; + pathname_len = dirlen; - if (pathname && !pop_dir(orig_dir)) { - rsyserr(FERROR, errno, "pop_dir %s failed", - full_fname(orig_dir)); - exit_cleanup(RERR_FILESELECT); - } + if (!dir) + dir = orig_dir; - if (dir && !push_dir(dir, 0)) { + if (!change_dir(dir, CD_NORMAL)) { + chdir_error: io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "push_dir %s failed in %s", - full_fname(dir), curr_dir); + rsyserr(FERROR_XFER, errno, "change_dir %s failed", full_fname(dir)); + if (dir != orig_dir) + change_dir(orig_dir, CD_NORMAL); + pathname = NULL; + pathname_len = 0; 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) +static void send_file_entry(int f, const char *fname, struct file_struct *file, +#ifdef SUPPORT_LINKS + const char *symlink_name, int symlink_len, +#endif + int ndx, int first_ndx) { static time_t modtime; static mode_t mode; @@ -351,52 +404,37 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ 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]; +#ifdef SUPPORT_HARD_LINKS int first_hlink_ndx = -1; +#endif int l1, l2; int xflags; -#ifdef ICONV_OPTION - if (ic_send != (iconv_t)-1) { - xbuf outbuf, inbuf; - - INIT_CONST_XBUF(outbuf, 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++] = '/'; - } - - 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); - - /* Initialize starting value of xflags. */ - if (protocol_version >= 30 && S_ISDIR(file->mode)) { - if (file->flags & FLAG_CONTENT_DIR) - xflags = file->flags & FLAG_TOP_DIR; - else if (file->flags & FLAG_IMPLIED_DIR) - xflags = XMIT_TOP_DIR | XMIT_NO_CONTENT_DIR; + /* Initialize starting value of xflags and adjust counts. */ + if (S_ISREG(file->mode)) + xflags = 0; + else if (S_ISDIR(file->mode)) { + stats.num_dirs++; + if (protocol_version >= 30) { + 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 */ + } else { + if (S_ISLNK(file->mode)) + stats.num_symlinks++; + else if (IS_DEVICE(file->mode)) + stats.num_devices++; else - xflags = XMIT_NO_CONTENT_DIR; - } else - xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ + stats.num_specials++; + xflags = 0; + } if (file->mode == mode) xflags |= XMIT_SAME_MODE; @@ -421,28 +459,24 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ } } else if (protocol_version < 28) rdev = MAKEDEV(0, 0); - 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 (!preserve_uid || ((uid_t)F_OWNER(file) == uid && *lastname)) + xflags |= XMIT_SAME_UID; + else { + uid = F_OWNER(file); + if (!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 (!preserve_gid || ((gid_t)F_GROUP(file) == gid && *lastname)) + xflags |= XMIT_SAME_GID; + else { + gid = F_GROUP(file); + if (!numeric_ids) { + group_name = add_gid(gid); + if (inc_recurse && group_name) + xflags |= XMIT_GROUP_NAME_FOLLOWS; } } if (file->modtime == modtime) @@ -459,15 +493,25 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ np->data = (void*)(long)(first_ndx + ndx + 1); xflags |= XMIT_HLINK_FIRST; } - xflags |= XMIT_HLINKED; + if (DEBUG_GTE(HLINK, 1)) { + if (first_hlink_ndx >= 0) { + rprintf(FINFO, "[%s] #%d hard-links #%d (%sabbrev)\n", + who_am_i(), first_ndx + ndx, first_hlink_ndx, + first_hlink_ndx >= first_ndx ? "" : "un"); + } else if (DEBUG_GTE(HLINK, 3)) { + rprintf(FINFO, "[%s] dev:inode for #%d is %s:%s\n", + who_am_i(), first_ndx + ndx, + big_num(tmp_dev), big_num(tmp_ino)); + } + } } else { if (tmp_dev == dev) { if (protocol_version >= 28) xflags |= XMIT_SAME_DEV_pre30; } else dev = tmp_dev; - xflags |= XMIT_HLINKED; } + xflags |= XMIT_HLINKED; } #endif @@ -506,11 +550,13 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ write_byte(f, l2); write_buf(f, fname + l1, l2); +#ifdef SUPPORT_HARD_LINKS if (first_hlink_ndx >= 0) { write_varint(f, first_hlink_ndx); if (first_hlink_ndx >= first_ndx) goto the_end; } +#endif write_varlong30(f, F_LENGTH(file), 3); if (!(xflags & XMIT_SAME_TIME)) { @@ -521,7 +567,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ } if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); - if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); else { @@ -533,7 +579,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ } } } - if (gid_ndx && !(xflags & XMIT_SAME_GID)) { + if (preserve_gid && !(xflags & XMIT_SAME_GID)) { if (protocol_version < 30) write_int(f, gid); else { @@ -563,11 +609,9 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ } #ifdef SUPPORT_LINKS - if (preserve_links && S_ISLNK(mode)) { - const char *sl = F_SYMLINK(file); - int len = strlen(sl); - write_varint30(f, len); - write_buf(f, sl, len); + if (symlink_len) { + write_varint30(f, symlink_len); + write_buf(f, symlink_name, symlink_len); } #endif @@ -597,7 +641,9 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ write_buf(f, sum, checksum_len); } +#ifdef SUPPORT_HARD_LINKS the_end: +#endif strlcpy(lastname, fname, MAXPATHLEN); if (S_ISREG(mode) || S_ISLNK(mode)) @@ -626,7 +672,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, int alloc_len, basename_len, linkname_len; int extra_len = file_extra_cnt * EXTRA_LEN; int first_hlink_ndx = -1; - OFF_T file_length; + int64 file_length; const char *basename; struct file_struct *file; alloc_pool_t *pool; @@ -659,23 +705,24 @@ static struct file_struct *recv_file_entry(struct file_list *flist, xbuf outbuf, inbuf; INIT_CONST_XBUF(outbuf, thisname); - INIT_XBUF(inbuf, lastname, basename_len, -1); + INIT_XBUF(inbuf, lastname, basename_len, (size_t)-1); if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) { io_error |= IOERR_GENERAL; - rprintf(FINFO, + rprintf(FERROR_UTF8, "[%s] cannot convert filename: %s (%s)\n", who_am_i(), lastname, strerror(errno)); outbuf.len = 0; } - outbuf.buf[outbuf.len] = '\0'; + thisname[outbuf.len] = '\0'; } #endif - clean_fname(thisname, 0); + if (*thisname) + clean_fname(thisname, 0); if (sanitize_paths) - sanitize_path(thisname, thisname, "", 0); + sanitize_path(thisname, thisname, "", 0, SP_DEFAULT); if ((basename = strrchr(thisname, '/')) != NULL) { int len = basename++ - thisname; @@ -700,14 +747,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist, first_hlink_ndx, flist->ndx_start + flist->used); exit_cleanup(RERR_PROTOCOL); } + if (DEBUG_GTE(HLINK, 1)) { + rprintf(FINFO, "[%s] #%d hard-links #%d (%sabbrev)\n", + who_am_i(), flist->used+flist->ndx_start, first_hlink_ndx, + first_hlink_ndx >= flist->ndx_start ? "" : "un"); + } 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) + if (preserve_uid) uid = F_OWNER(first); - if (gid_ndx) + if (preserve_gid) gid = F_GROUP(first); if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { @@ -744,18 +796,18 @@ static struct file_struct *recv_file_entry(struct file_list *flist, if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); - if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) uid = (uid_t)read_int(f); else { uid = (uid_t)read_varint(f); if (xflags & XMIT_USER_NAME_FOLLOWS) uid = recv_user_name(f, uid); - else if (inc_recurse && am_root && !numeric_ids) + else if (inc_recurse && am_root && (!numeric_ids || usermap)) uid = match_uid(uid); } } - if (gid_ndx && !(xflags & XMIT_SAME_GID)) { + if (preserve_gid && !(xflags & XMIT_SAME_GID)) { if (protocol_version < 30) gid = (gid_t)read_int(f); else { @@ -763,7 +815,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist, 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)) + else if (inc_recurse && (!am_root || !numeric_ids || groupmap)) gid = match_gid(gid, &gid_flags); } } @@ -798,6 +850,13 @@ static struct file_struct *recv_file_entry(struct file_list *flist, linkname_len - 1); overflow_exit("recv_file_entry"); } +#ifdef ICONV_OPTION + /* We don't know how much extra room we need to convert + * the as-yet-unread symlink data, so let's hope that a + * double-size buffer is plenty. */ + if (sender_symlink_iconv) + linkname_len *= 2; +#endif if (munge_symlinks) linkname_len += SYMLINK_PREFIX_LEN; } @@ -816,16 +875,22 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #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; + /* Directories need an extra int32 for the default ACL. */ + if (preserve_acls && S_ISDIR(mode)) + extra_len += EXTRA_LEN; #endif if (always_checksum && S_ISREG(mode)) extra_len += SUM_EXTRA_CNT * EXTRA_LEN; +#if SIZEOF_INT64 >= 8 if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) extra_len += EXTRA_LEN; +#endif + if (file_length < 0) { + rprintf(FERROR, "Offset underflow: file-length is negative\n"); + exit_cleanup(RERR_UNSUPPORTED); + } if (inc_recurse && S_ISDIR(mode)) { if (one_file_system) { @@ -851,7 +916,6 @@ static struct file_struct *recv_file_entry(struct file_list *flist, bp += FILE_STRUCT_LEN; memcpy(bp, basename, basename_len); - bp += basename_len + linkname_len; /* skip space for symlink too */ #ifdef SUPPORT_HARD_LINKS if (xflags & XMIT_HLINKED) @@ -859,14 +923,21 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #endif file->modtime = (time_t)modtime; file->len32 = (uint32)file_length; +#if SIZEOF_INT64 >= 8 if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) { +#if SIZEOF_CAPITAL_OFF_T < 8 + rprintf(FERROR, "Offset overflow: attempted 64-bit file-length\n"); + exit_cleanup(RERR_UNSUPPORTED); +#else file->flags |= FLAG_LENGTH64; OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); +#endif } +#endif file->mode = mode; - if (uid_ndx) + if (preserve_uid) F_OWNER(file) = uid; - if (gid_ndx) { + if (preserve_gid) { F_GROUP(file) = gid; file->flags |= gid_flags; } @@ -916,19 +987,45 @@ static struct file_struct *recv_file_entry(struct file_list *flist, #ifdef SUPPORT_LINKS if (linkname_len) { - bp = (char*)file->basename + basename_len; + bp += 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 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); + if (munge_symlinks) { + strlcpy(bp, SYMLINK_PREFIX, linkname_len); + bp += SYMLINK_PREFIX_LEN; + linkname_len -= SYMLINK_PREFIX_LEN; + } +#ifdef ICONV_OPTION + if (sender_symlink_iconv) { + xbuf outbuf, inbuf; + + alloc_len = linkname_len; + linkname_len /= 2; + + /* Read the symlink data into the end of our double-sized + * buffer and then convert it into the right spot. */ + INIT_XBUF(inbuf, bp + alloc_len - linkname_len, + linkname_len - 1, (size_t)-1); + read_sbuf(f, inbuf.buf, inbuf.len); + INIT_XBUF(outbuf, bp, 0, alloc_len); + + if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) { + io_error |= IOERR_GENERAL; + rprintf(FERROR_XFER, + "[%s] cannot convert symlink data for: %s (%s)\n", + who_am_i(), full_fname(thisname), strerror(errno)); + bp = (char*)file->basename; + *bp++ = '\0'; + outbuf.len = 0; + } + bp[outbuf.len] = '\0'; + } else +#endif + read_sbuf(f, bp, linkname_len - 1); + if (sanitize_paths && !munge_symlinks && *bp) + sanitize_path(bp, bp, "", lastdir_depth, SP_DEFAULT); } } #endif @@ -997,7 +1094,12 @@ static struct file_struct *recv_file_entry(struct file_list *flist, * and performing extensive checks against global options. * * Returns a pointer to the new file struct, or NULL if there was an error - * or this file should be excluded. */ + * or this file should be excluded. + * + * Note: Any error (here or in send_file_name) that results in the omission of + * an existent source file from the file list should set + * "io_error |= IOERR_GENERAL" to avoid deletion of the file from the + * destination if --delete is on. */ struct file_struct *make_file(const char *fname, struct file_list *flist, STRUCT_STAT *stp, int flags, int filter_level) { @@ -1014,12 +1116,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, char *bp; if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) { - rprintf(FINFO, "skipping overly long name: %s\n", fname); + io_error |= IOERR_GENERAL; + rprintf(FERROR_XFER, "skipping overly long name: %s\n", fname); return NULL; } clean_fname(thisname, 0); if (sanitize_paths) - sanitize_path(thisname, thisname, "", 0); + sanitize_path(thisname, thisname, "", 0, SP_DEFAULT); if (stp && S_ISDIR(stp->st_mode)) { st = *stp; /* Needed for "symlink/." with --relative. */ @@ -1036,9 +1139,15 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, } if (save_errno == ENOENT) { #ifdef SUPPORT_LINKS - /* Avoid "vanished" error if symlink points nowhere. */ - if (copy_links && x_lstat(thisname, &st, NULL) == 0 - && S_ISLNK(st.st_mode)) { + /* When our options tell us to follow a symlink that + * points nowhere, tell the user about the symlink + * instead of giving a "vanished" message. We only + * dereference a symlink if one of the --copy*links + * options was specified, so there's no need for the + * extra lstat() if one of these options isn't on. */ + if ((copy_links || copy_unsafe_links || copy_dirlinks) + && x_lstat(thisname, &st, NULL) == 0 + && S_ISLNK(st.st_mode)) { io_error |= IOERR_GENERAL; rprintf(FERROR_XFER, "symlink has no referent: %s\n", full_fname(thisname)); @@ -1053,13 +1162,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, } } else { io_error |= IOERR_GENERAL; - rsyserr(FERROR_XFER, save_errno, "readlink %s failed", + rsyserr(FERROR_XFER, save_errno, "readlink_stat(%s) failed", full_fname(thisname)); } return NULL; } - /* backup.c calls us with filter_level set to NO_FILTERS. */ if (filter_level == NO_FILTERS) goto skip_filters; @@ -1074,7 +1182,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, 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 > 1) { + if (INFO_GTE(MOUNT, 1)) { rprintf(FINFO, "[%s] skipping mount-point dir %s\n", who_am_i(), thisname); @@ -1114,10 +1222,16 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, pool = dir_flist->file_pool; } else pool = flist->file_pool; - } else + } else { +#ifdef SUPPORT_ACLS + /* Directories need an extra int32 for the default ACL. */ + if (preserve_acls && S_ISDIR(st.st_mode)) + extra_len += EXTRA_LEN; +#endif pool = NULL; + } - if (verbose > 2) { + if (DEBUG_GTE(FLIST, 2)) { rprintf(FINFO, "[%s] make_file(%s,*,%d)\n", who_am_i(), thisname, filter_level); } @@ -1140,8 +1254,16 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, linkname_len = 0; #endif +#if SIZEOF_CAPITAL_OFF_T >= 8 if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) extra_len += EXTRA_LEN; +#endif + + if (always_checksum && am_sender && S_ISREG(st.st_mode)) { + file_checksum(thisname, tmp_sum, st.st_size); + if (sender_keeps_checksum) + extra_len += SUM_EXTRA_CNT * EXTRA_LEN; + } #if EXTRA_ROUNDING > 0 if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) @@ -1163,15 +1285,14 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, bp += FILE_STRUCT_LEN; memcpy(bp, basename, basename_len); - bp += basename_len + linkname_len; /* skip space for symlink too */ #ifdef SUPPORT_HARD_LINKS 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; + tmp_dev = (int64)st.st_dev + 1; + tmp_ino = (int64)st.st_ino; } else tmp_dev = 0; } @@ -1187,55 +1308,42 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, file->flags = flags; file->modtime = st.st_mtime; file->len32 = (uint32)st.st_size; +#if SIZEOF_CAPITAL_OFF_T >= 8 if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) { file->flags |= FLAG_LENGTH64; OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); } +#endif file->mode = st.st_mode; - if (uid_ndx) + if (uid_ndx) /* Check uid_ndx instead of preserve_uid for del support */ F_OWNER(file) = st.st_uid; - if (gid_ndx) + if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */ F_GROUP(file) = st.st_gid; if (basename != thisname) file->dirname = lastdir; #ifdef SUPPORT_LINKS - if (linkname_len) { - bp = (char*)file->basename + basename_len; - memcpy(bp, linkname, linkname_len); - } + if (linkname_len) + memcpy(bp + basename_len, linkname, linkname_len); #endif - if (always_checksum && am_sender && S_ISREG(st.st_mode)) - file_checksum(thisname, tmp_sum, st.st_size); + if (am_sender) + F_PATHNAME(file) = pathname; + else if (!pool) + F_DEPTH(file) = extra_len / EXTRA_LEN; - F_PATHNAME(file) = pathname; - - /* This code is only used by the receiver when it is building - * a list of files for a delete pass. */ - if (keep_dirlinks && linkname_len && flist) { - STRUCT_STAT st2; - int save_mode = file->mode; - file->mode = S_IFDIR; /* Find a directory with our name. */ - if (flist_find(dir_flist, file) >= 0 - && x_stat(thisname, &st2, NULL) == 0 && S_ISDIR(st2.st_mode)) { - file->modtime = st2.st_mtime; - file->len32 = 0; - file->mode = st2.st_mode; - if (uid_ndx) - F_OWNER(file) = st2.st_uid; - if (gid_ndx) - F_GROUP(file) = st2.st_gid; - } else - file->mode = save_mode; + if (basename_len == 0+1) { + if (!pool) + unmake_file(file); + return NULL; } - if (basename_len == 0+1) - return NULL; + if (sender_keeps_checksum && S_ISREG(st.st_mode)) + memcpy(F_SUM(file), tmp_sum, checksum_len); if (unsort_ndx) - F_NDX(file) = dir_count; + F_NDX(file) = stats.num_dirs; return file; } @@ -1243,22 +1351,14 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, /* 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)); + free(REQ_EXTRA(file, F_DEPTH(file))); } static struct file_struct *send_file_name(int f, struct file_list *flist, - char *fname, STRUCT_STAT *stp, + const char *fname, STRUCT_STAT *stp, int flags, int filter_level) { struct file_struct *file; -#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS - stat_x sx; -#endif file = make_file(fname, flist, stp, flags, filter_level); if (!file) @@ -1267,30 +1367,102 @@ static struct file_struct *send_file_name(int f, struct file_list *flist, if (chmod_modes && !S_ISLNK(file->mode)) file->mode = tweak_mode(file->mode, chmod_modes); + if (f >= 0) { + char fbuf[MAXPATHLEN]; +#ifdef SUPPORT_LINKS + const char *symlink_name; + int symlink_len; +#ifdef ICONV_OPTION + char symlink_buf[MAXPATHLEN]; +#endif +#endif +#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS + stat_x sx; + init_stat_x(&sx); +#endif + +#ifdef SUPPORT_LINKS + if (preserve_links && S_ISLNK(file->mode)) { + symlink_name = F_SYMLINK(file); + symlink_len = strlen(symlink_name); + } else { + symlink_name = NULL; + symlink_len = 0; + } +#endif + +#ifdef ICONV_OPTION + if (ic_send != (iconv_t)-1) { + xbuf outbuf, inbuf; + + INIT_CONST_XBUF(outbuf, fbuf); + + 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; + fbuf[outbuf.len++] = '/'; + } + + INIT_XBUF_STRLEN(inbuf, (char*)file->basename); + if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) { + convert_error: + io_error |= IOERR_GENERAL; + rprintf(FERROR_XFER, + "[%s] cannot convert filename: %s (%s)\n", + who_am_i(), f_name(file, fbuf), strerror(errno)); + return NULL; + } + fbuf[outbuf.len] = '\0'; + +#ifdef SUPPORT_LINKS + if (symlink_len && sender_symlink_iconv) { + INIT_XBUF(inbuf, (char*)symlink_name, symlink_len, (size_t)-1); + INIT_CONST_XBUF(outbuf, symlink_buf); + if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) { + io_error |= IOERR_GENERAL; + f_name(file, fbuf); + rprintf(FERROR_XFER, + "[%s] cannot convert symlink data for: %s (%s)\n", + who_am_i(), full_fname(fbuf), strerror(errno)); + return NULL; + } + symlink_buf[outbuf.len] = '\0'; + + symlink_name = symlink_buf; + symlink_len = outbuf.len; + } +#endif + } else +#endif + f_name(file, fbuf); + #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; - } + if (preserve_acls && !S_ISLNK(file->mode)) { + sx.st.st_mode = file->mode; + if (get_acl(fname, &sx) < 0) { + io_error |= IOERR_GENERAL; + return NULL; + } + } #endif #ifdef SUPPORT_XATTRS - if (preserve_xattrs && f >= 0) { - sx.xattr = NULL; - if (get_xattr(fname, &sx) < 0) - return NULL; - } + if (preserve_xattrs) { + if (get_xattr(fname, &sx) < 0) { + io_error |= IOERR_GENERAL; + return NULL; + } + } #endif - maybe_emit_filelist_progress(flist->used + flist_count_offset); + send_file_entry(f, fbuf, file, +#ifdef SUPPORT_LINKS + symlink_name, symlink_len, +#endif + flist->used, flist->ndx_start); - flist_expand(flist, 1); - flist->files[flist->used++] = file; - if (f >= 0) { - if (S_ISDIR(file->mode)) - dir_count++; - 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); @@ -1304,6 +1476,12 @@ static struct file_struct *send_file_name(int f, struct file_list *flist, } #endif } + + maybe_emit_filelist_progress(flist->used + flist_count_offset); + + flist_expand(flist, 1); + flist->files[flist->used++] = file; + return file; } @@ -1460,6 +1638,8 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len, assert(flist != NULL); if (!(d = opendir(fbuf))) { + if (errno == ENOENT) + return; io_error |= IOERR_GENERAL; rsyserr(FERROR_XFER, errno, "opendir %s failed", full_fname(fbuf)); return; @@ -1478,14 +1658,14 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len, continue; if (strlcpy(p, dname, remainder) >= remainder) { io_error |= IOERR_GENERAL; - rprintf(FINFO, + rprintf(FERROR_XFER, "cannot send long-named file %s\n", full_fname(fbuf)); continue; } if (dname[0] == '\0') { io_error |= IOERR_GENERAL; - rprintf(FINFO, + rprintf(FERROR_XFER, "cannot send file with empty name in %s\n", full_fname(fbuf)); continue; @@ -1511,20 +1691,20 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len, } } -static char lastpath[MAXPATHLEN] = ""; -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, char name_type) { + static char lastpath[MAXPATHLEN] = ""; + static int lastpath_len = 0; + static struct file_struct *lastpath_struct = NULL; struct file_struct *file; item_list *relname_list; relnamecache **rnpp; - char *slash; - int len, need_new_dir; + int len, need_new_dir, depth = 0; + struct filter_list_struct save_filter_list = filter_list; flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR); + filter_list.head = filter_list.tail = NULL; /* Don't filter implied dirs. */ if (inc_recurse) { if (lastpath_struct && F_PATHNAME(lastpath_struct) == pathname @@ -1533,12 +1713,31 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname, need_new_dir = 0; else need_new_dir = 1; - } else + } else { + char *tp = fname, *lp = lastpath; + /* Skip any initial directories in our path that we + * have in common with lastpath. */ + assert(start == fname); + for ( ; ; tp++, lp++) { + if (tp == limit) { + if (*lp == '/' || *lp == '\0') + goto done; + break; + } + if (*lp != *tp) + break; + if (*tp == '/') { + start = tp; + depth++; + } + } need_new_dir = 1; + } if (need_new_dir) { int save_copy_links = copy_links; int save_xfer_dirs = xfer_dirs; + char *slash; copy_links = xfer_dirs = 1; @@ -1546,7 +1745,10 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname, for (slash = start; (slash = strchr(slash+1, '/')) != NULL; ) { *slash = '\0'; - send_file_name(f, flist, fname, NULL, flags, ALL_FILTERS); + file = send_file_name(f, flist, fname, NULL, flags, ALL_FILTERS); + depth++; + if (!inc_recurse && file && S_ISDIR(file->mode)) + change_local_filter_dir(fname, strlen(fname), depth); *slash = '/'; } @@ -1555,7 +1757,8 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname, if (file && !S_ISDIR(file->mode)) file = NULL; lastpath_struct = file; - } + } else if (file && S_ISDIR(file->mode)) + change_local_filter_dir(fname, strlen(fname), ++depth); strlcpy(lastpath, fname, sizeof lastpath); lastpath_len = limit - fname; @@ -1566,11 +1769,11 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname, xfer_dirs = save_xfer_dirs; if (!inc_recurse) - return; + goto done; } if (!lastpath_struct) - return; /* dir must have vanished */ + goto done; /* dir must have vanished */ len = strlen(limit+1); memcpy(&relname_list, F_DIR_RELNAMES_P(lastpath_struct), sizeof relname_list); @@ -1584,6 +1787,9 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname, out_of_memory("send_implied_dirs"); (*rnpp)->name_type = name_type; strlcpy((*rnpp)->fname, limit+1, len + 1); + +done: + filter_list = save_filter_list; } static void send1extra(int f, struct file_struct *file, struct file_list *flist) @@ -1596,10 +1802,8 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist) f_name(file, fbuf); dlen = strlen(fbuf); - if (F_PATHNAME(file) != pathname) { - if (!push_pathname(F_PATHNAME(file), -1)) - exit_cleanup(RERR_FILESELECT); - } + if (!change_pathname(file, NULL, 0)) + exit_cleanup(RERR_FILESELECT); change_local_filter_dir(fbuf, dlen, send_dir_depth); @@ -1674,7 +1878,7 @@ void send_extra_file_list(int f, int at_least) 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; + int dir_ndx, dstart = stats.num_dirs; const char *pathname = F_PATHNAME(file); int32 *dp; @@ -1707,7 +1911,12 @@ void send_extra_file_list(int f, int at_least) dp = F_DIR_NODE_P(file); } - write_byte(f, 0); + if (protocol_version < 31 || io_error == save_io_error || ignore_errors) + write_byte(f, 0); + else { + write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST); + write_int(f, io_error); + } if (need_unsorted_flist) { if (!(flist->sorted = new_array(struct file_struct *, flist->used))) @@ -1719,13 +1928,13 @@ void send_extra_file_list(int f, int at_least) flist_sort_and_clean(flist, 0); - add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart); + add_dirs_to_tree(send_dir_ndx, flist, stats.num_dirs - dstart); flist_done_allocating(flist); file_total += flist->used; stats.flist_size += stats.total_written - start_write; stats.num_files += flist->used; - if (verbose > 3) + if (DEBUG_GTE(FLIST, 3)) output_flist(flist); if (DIR_FIRST_CHILD(dp) >= 0) { @@ -1748,7 +1957,7 @@ void send_extra_file_list(int f, int at_least) } finish: - if (io_error != save_io_error && !ignore_errors) + if (io_error != save_io_error && protocol_version == 30 && !ignore_errors) send_msg_int(MSG_IO_ERROR, io_error); } @@ -1771,11 +1980,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) | (filesfrom_convert ? RL_CONVERT : 0) #endif | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0); + int implied_dot_dir = 0; rprintf(FLOG, "building file list\n"); if (show_filelist_p()) start_filelist_progress("building file list"); - else if (inc_recurse && verbose && !am_server) + else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server) rprintf(FCLIENT, "sending incremental file list\n"); start_write = stats.total_written; @@ -1798,27 +2008,30 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) disable_buffering = io_start_buffering_out(f); if (filesfrom_fd >= 0) { - if (argv[0] && !push_dir(argv[0], 0)) { - rsyserr(FERROR_XFER, errno, "push_dir %s failed in %s", - full_fname(argv[0]), curr_dir); + if (argv[0] && !change_dir(argv[0], CD_NORMAL)) { + rsyserr(FERROR_XFER, errno, "change_dir %s failed", + full_fname(argv[0])); exit_cleanup(RERR_FILESELECT); } use_ff_fd = 1; } + if (!orig_dir) + orig_dir = strdup(curr_dir); + while (1) { 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); + sanitize_path(fbuf, fbuf, "", 0, SP_KEEP_DOT_DIRS); } else { if (argc-- == 0) break; strlcpy(fbuf, *argv++, MAXPATHLEN); if (sanitize_paths) - sanitize_path(fbuf, fbuf, "", 0); + sanitize_path(fbuf, fbuf, "", 0, SP_KEEP_DOT_DIRS); } len = strlen(fbuf); @@ -1828,14 +2041,14 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } else if (!len || fbuf[len - 1] == '/') { if (len == 2 && fbuf[0] == '.') { /* Turn "./" into just "." rather than "./." */ - fbuf[1] = '\0'; + fbuf[--len] = '\0'; } else { if (len + 1 >= MAXPATHLEN) overflow_exit("send_file_list"); fbuf[len++] = '.'; fbuf[len] = '\0'; } - name_type = DOT_NAME; + name_type = DOTDIR_NAME; } else if (len > 1 && fbuf[len-1] == '.' && fbuf[len-2] == '.' && (len == 2 || fbuf[len-3] == '/')) { if (len + 2 >= MAXPATHLEN) @@ -1843,9 +2056,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) fbuf[len++] = '/'; fbuf[len++] = '.'; fbuf[len] = '\0'; - name_type = DOT_NAME; + name_type = DOTDIR_NAME; } else if (fbuf[len-1] == '.' && (len == 1 || fbuf[len-2] == '/')) - name_type = DOT_NAME; + name_type = DOTDIR_NAME; else name_type = NORMAL_NAME; @@ -1868,8 +2081,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) *p = '\0'; if (p == fbuf) dir = "/"; - else + else { dir = fbuf; + clean_fname(dir, 0); + } fn = p + 3; while (*fn == '/') fn++; @@ -1877,20 +2092,27 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) *--fn = '\0'; /* ensure room for '.' */ } else fn = fbuf; - len = clean_fname(fn, CFN_KEEP_LEADING_DOT_DIR - | CFN_KEEP_TRAILING_SLASH + /* A leading ./ can be used in relative mode to affect + * the dest dir without its name being in the path. */ + if (*fn == '.' && fn[1] == '/' && !implied_dot_dir) { + send_file_name(f, flist, ".", NULL, + (flags | FLAG_IMPLIED_DIR) & ~FLAG_CONTENT_DIR, + ALL_FILTERS); + implied_dot_dir = 1; + } + len = clean_fname(fn, CFN_KEEP_TRAILING_SLASH | CFN_DROP_TRAILING_DOT_DIR); if (len == 1) { if (fn[0] == '/') { fn = "/."; len = 2; - name_type = DOT_NAME; + name_type = DOTDIR_NAME; } else if (fn[0] == '.') - name_type = DOT_NAME; + name_type = DOTDIR_NAME; } else if (fn[len-1] == '/') { fn[--len] = '\0'; if (len == 1 && *fn == '.') - name_type = DOT_NAME; + name_type = DOTDIR_NAME; else name_type = SLASH_ENDING_NAME; } @@ -1909,28 +2131,35 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (!*fn) { len = 1; fn = "."; - name_type = DOT_NAME; + name_type = DOTDIR_NAME; } dirlen = dir ? strlen(dir) : 0; if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { - if (!push_pathname(dir ? strdup(dir) : NULL, dirlen)) + if (!change_pathname(NULL, dir, -dirlen)) continue; lastdir = pathname; lastdir_len = pathname_len; - } else if (!push_pathname(lastdir, lastdir_len)) + } else if (!change_pathname(NULL, lastdir, lastdir_len)) continue; if (fn != fbuf) memmove(fbuf, fn, len + 1); - if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0) { + if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0 + || (name_type != DOTDIR_NAME && is_daemon_excluded(fbuf, S_ISDIR(st.st_mode))) + || (relative_paths && path_is_daemon_excluded(fbuf, 1))) { io_error |= IOERR_GENERAL; rsyserr(FERROR_XFER, errno, "link_stat %s failed", full_fname(fbuf)); continue; } + /* A dot-dir should not be excluded! */ + if (name_type != DOTDIR_NAME + && is_excluded(fbuf, S_ISDIR(st.st_mode) != 0, ALL_FILTERS)) + continue; + if (S_ISDIR(st.st_mode) && !xfer_dirs) { rprintf(FINFO, "skipping directory %s\n", fbuf); continue; @@ -1950,17 +2179,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } else 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. */ - char *lp = lastpath, *slash = fbuf; - *p = '\0'; - /* Skip any initial directories in our path that we - * have in common with lastpath. */ - for (fn = fbuf; *fn && *lp == *fn; lp++, fn++) { - if (*fn == '/') - slash = fn; - } - *p = '/'; - if (fn != p || (*lp && *lp != '/')) - send_implied_dirs(f, flist, fbuf, slash, p, flags, 0); + send_implied_dirs(f, flist, fbuf, fbuf, p, flags, 0); } if (one_file_system) @@ -1968,21 +2187,23 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (recurse || (xfer_dirs && name_type != NORMAL_NAME)) { struct file_struct *file; - int top_flags = FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags; file = send_file_name(f, flist, fbuf, &st, - top_flags, ALL_FILTERS); + FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags, + NO_FILTERS); + if (!file) + continue; if (inc_recurse) { - if (name_type == DOT_NAME) { + if (name_type == DOTDIR_NAME) { if (send_dir_depth < 0) { send_dir_depth = 0; change_local_filter_dir(fbuf, len, send_dir_depth); } send_directory(f, flist, fbuf, len, flags); } - } else if (file) + } else send_if_directory(f, flist, file, fbuf, len, flags); } else - send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS); + send_file_name(f, flist, fbuf, &st, flags, NO_FILTERS); } gettimeofday(&end_tv, NULL); @@ -1992,7 +2213,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) stats.flist_buildtime = 1; start_tv = end_tv; - write_byte(f, 0); /* Indicate end of file list */ + /* Indicate end of file list */ + if (protocol_version < 31 || io_error == 0 || ignore_errors) + write_byte(f, 0); + else { + write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST); + write_int(f, io_error); + } #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && protocol_version >= 30 && !inc_recurse) @@ -2024,13 +2251,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) flist_sort_and_clean(flist, 0); file_total += flist->used; - if (!numeric_ids && !inc_recurse) + if (numeric_ids <= 0 && !inc_recurse) send_id_list(f); /* send the io_error flag */ if (protocol_version < 30) write_int(f, ignore_errors ? 0 : io_error); - else if (io_error && !ignore_errors) + else if (io_error && protocol_version == 30 && !ignore_errors) send_msg_int(MSG_IO_ERROR, io_error); if (disable_buffering) @@ -2039,16 +2266,16 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) stats.flist_size = stats.total_written - start_write; stats.num_files = flist->used; - if (verbose > 3) + if (DEBUG_GTE(FLIST, 3)) output_flist(flist); - if (verbose > 2) + if (DEBUG_GTE(FLIST, 2)) 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) + add_dirs_to_tree(-1, flist, stats.num_dirs); + if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0) flist->parent_ndx = -1; flist_done_allocating(flist); if (send_dir_ndx < 0) { @@ -2072,12 +2299,17 @@ struct file_list *recv_file_list(int f) int dstart, flags; int64 start_read; - if (!first_flist) + if (!first_flist) { + if (show_filelist_p()) + start_filelist_progress("receiving file list"); + else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server) + rprintf(FCLIENT, "receiving incremental file list\n"); 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"); + if (usermap) + parse_name_map(usermap, True); + if (groupmap) + parse_name_map(groupmap, False); + } start_read = stats.total_read; @@ -2100,29 +2332,51 @@ struct file_list *recv_file_list(int f) while ((flags = read_byte(f)) != 0) { struct file_struct *file; - flist_expand(flist, 1); - if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS)) flags |= read_byte(f) << 8; - file = recv_file_entry(flist, flags, f); - if (inc_recurse && S_ISDIR(file->mode)) { - flist_expand(dir_flist, 1); - dir_flist->files[dir_flist->used++] = file; + if (flags == (XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST)) { + int err; + if (protocol_version < 31) { + rprintf(FERROR, "Invalid flist flag: %x\n", flags); + exit_cleanup(RERR_PROTOCOL); + } + err = read_int(f); + if (!ignore_errors) + io_error |= err; + break; } + flist_expand(flist, 1); + file = recv_file_entry(flist, flags, f); + + if (S_ISREG(file->mode)) { + /* Already counted */ + } else if (S_ISDIR(file->mode)) { + if (inc_recurse) { + flist_expand(dir_flist, 1); + dir_flist->files[dir_flist->used++] = file; + } + stats.num_dirs++; + } else if (S_ISLNK(file->mode)) + stats.num_symlinks++; + else if (IS_DEVICE(file->mode)) + stats.num_symlinks++; + else + stats.num_specials++; + flist->files[flist->used++] = file; maybe_emit_filelist_progress(flist->used); - if (verbose > 2) { - rprintf(FINFO, "recv_file_name(%s)\n", - f_name(file, NULL)); + if (DEBUG_GTE(FLIST, 2)) { + char *name = f_name(file, NULL); + rprintf(FINFO, "recv_file_name(%s)\n", NS(name)); } } file_total += flist->used; - if (verbose > 2) + if (DEBUG_GTE(FLIST, 2)) rprintf(FINFO, "received %d names\n", flist->used); if (show_filelist_p()) @@ -2167,19 +2421,18 @@ struct file_list *recv_file_list(int f) if (protocol_version < 30) { /* Recv the io_error flag */ - if (ignore_errors) - read_int(f); - else - io_error |= read_int(f); + int err = read_int(f); + if (!ignore_errors) + io_error |= err; } else if (inc_recurse && flist->ndx_start == 1) { - if (!file_total || strcmp(flist->sorted[0]->basename, ".") != 0) + if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0) flist->parent_ndx = -1; } - if (verbose > 3) + if (DEBUG_GTE(FLIST, 3)) output_flist(flist); - if (verbose > 2) + if (DEBUG_GTE(FLIST, 2)) rprintf(FINFO, "recv_file_list done\n"); stats.flist_size += stats.total_read - start_read; @@ -2207,7 +2460,7 @@ void recv_additional_file_list(int f) NDX_FLIST_OFFSET - dir_flist->used + 1); exit_cleanup(RERR_PROTOCOL); } - if (verbose > 3) { + if (DEBUG_GTE(FLIST, 3)) { rprintf(FINFO, "[%s] receiving flist for dir %d\n", who_am_i(), ndx); } @@ -2267,6 +2520,28 @@ int flist_find(struct file_list *flist, struct file_struct *f) return -1; } +/* Search for an identically-named item in the file list. Differs from + * flist_find in that an item that agrees with "f" in directory-ness is + * preferred but one that does not is still found. */ +int flist_find_ignore_dirness(struct file_list *flist, struct file_struct *f) +{ + mode_t save_mode; + int ndx; + + /* First look for an item that agrees in directory-ness. */ + ndx = flist_find(flist, f); + if (ndx >= 0) + return ndx; + + /* Temporarily flip f->mode to look for an item of opposite + * directory-ness. */ + save_mode = f->mode; + f->mode = S_ISDIR(f->mode) ? S_IFREG : S_IFDIR; + ndx = flist_find(flist, f); + f->mode = save_mode; + return ndx; +} + /* * Free up any resources a file_struct has allocated * and clear the file. @@ -2292,14 +2567,16 @@ struct file_list *flist_new(int flags, char *msg) if (flags & FLIST_TEMP) { if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0, - out_of_memory, POOL_INTERN))) + 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); + out_of_memory, + POOL_INTERN); if (!flist->file_pool) out_of_memory(msg); @@ -2429,7 +2706,7 @@ static void flist_sort_and_clean(struct file_list *flist, int strip_root) keep = j, drop = i; if (!am_sender) { - if (verbose > 1) { + if (DEBUG_GTE(DUP, 1)) { rprintf(FINFO, "removing duplicate name %s from file list (%d)\n", f_name(file, fbuf), drop + flist->ndx_start); @@ -2570,10 +2847,10 @@ static void output_flist(struct file_list *flist) } 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", + "[%s] i=%d %s %s%s%s%s mode=0%o len=%s%s%s flags=%x\n", who, i + flist->ndx_start, root, dir, slash, name, trail, - (int)file->mode, (double)F_LENGTH(file), + (int)file->mode, comma_num(F_LENGTH(file)), uidbuf, gidbuf, file->flags); } } @@ -2787,7 +3064,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, 0); xfer_dirs = save_xfer_dirs; recurse = save_recurse; - if (do_progress) + if (INFO_GTE(PROGRESS, 1)) flist_count_offset += dirlist->used; prune_empty_dirs = 0; @@ -2795,7 +3072,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) flist_sort_and_clean(dirlist, 0); prune_empty_dirs = save_prune_empty_dirs; - if (verbose > 3) + if (DEBUG_GTE(FLIST, 3)) output_flist(dirlist); return dirlist;