X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e6ffb966ddafc5be6f840e1e09955e773d54b2bd..e4fdf1debee8313a767c94a42f5181df9ca881e0:/flist.c diff --git a/flist.c b/flist.c index 6b1be786..7e4eef55 100644 --- a/flist.c +++ b/flist.c @@ -1,34 +1,29 @@ /* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 - Copyright (C) 2001, 2002 by Martin Pool - - 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -/** @file flist.c - * Generate and receive file lists + * Generate and receive file lists. * - * @sa http://lists.samba.org/pipermail/rsync/2000-June/002351.html + * 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 * - **/ + * 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 + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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. + */ #include "rsync.h" extern int verbose; -extern int dry_run; extern int list_only; extern int am_root; extern int am_server; @@ -43,10 +38,10 @@ extern int recurse; extern int xfer_dirs; extern int filesfrom_fd; extern int one_file_system; +extern int copy_dirlinks; extern int keep_dirlinks; extern int preserve_links; extern int preserve_hard_links; -extern int preserve_perms; extern int preserve_devices; extern int preserve_specials; extern int preserve_uid; @@ -58,7 +53,6 @@ extern int copy_links; extern int copy_unsafe_links; extern int protocol_version; extern int sanitize_paths; -extern int orig_umask; extern struct stats stats; extern struct file_list *the_file_list; @@ -96,15 +90,15 @@ static int show_filelist_p(void) static void start_filelist_progress(char *kind) { - rprintf(FINFO, "%s ... ", kind); + rprintf(FCLIENT, "%s ... ", kind); if (verbose > 1 || do_progress) - rprintf(FINFO, "\n"); + rprintf(FCLIENT, "\n"); rflush(FINFO); } static void emit_filelist_progress(int count) { - rprintf(FINFO, " %d files...\r", count); + rprintf(FCLIENT, " %d files...\r", count); } static void maybe_emit_filelist_progress(int count) @@ -130,86 +124,78 @@ void show_flist_stats(void) static void list_file_entry(struct file_struct *f) { - char perms[11]; + char permbuf[PERMSTRING_SIZE]; if (!f->basename) { /* this can happen if duplicate names were removed */ return; } - permstring(perms, f->mode); + permstring(permbuf, f->mode); #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { rprintf(FINFO, "%s %11.0f %s %s -> %s\n", - perms, + permbuf, (double)f->length, timestring(f->modtime), f_name(f, NULL), f->u.link); } else #endif { rprintf(FINFO, "%s %11.0f %s %s\n", - perms, + permbuf, (double)f->length, timestring(f->modtime), f_name(f, NULL)); } } -/** - * Stat either a symlink or its referent, depending on the settings of - * copy_links, copy_unsafe_links, etc. - * - * @retval -1 on error +/* Stat either a symlink or its referent, depending on the settings of + * copy_links, copy_unsafe_links, etc. Returns -1 on error, 0 on success. * - * @retval 0 for success + * If path is the name of a symlink, then the linkbuf buffer (which must hold + * MAXPATHLEN chars) will be set to the symlink's target string. * - * @post If @p path is a symlink, then @p linkbuf (of size @c - * MAXPATHLEN) contains the symlink target. - * - * @post @p buffer contains information about the link or the - * referrent as appropriate, if they exist. - **/ -static int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf) + * The stat structure pointed to by stp will contain information about the + * link or the referent as appropriate, if they exist. */ +static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf) { #ifdef SUPPORT_LINKS - if (copy_links) - return do_stat(path, buffer); - if (link_stat(path, buffer, 0) < 0) + if (link_stat(path, stp, copy_dirlinks) < 0) return -1; - if (S_ISLNK(buffer->st_mode)) { - int l = readlink((char *)path, linkbuf, MAXPATHLEN - 1); - if (l == -1) + if (S_ISLNK(stp->st_mode)) { + int llen = readlink(path, linkbuf, MAXPATHLEN - 1); + if (llen < 0) return -1; - linkbuf[l] = 0; + linkbuf[llen] = '\0'; if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) { if (verbose > 1) { rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", path, linkbuf); } - return do_stat(path, buffer); + return do_stat(path, stp); } } return 0; #else - return do_stat(path, buffer); + return do_stat(path, stp); #endif } -int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks) +int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks) { #ifdef SUPPORT_LINKS if (copy_links) - return do_stat(path, buffer); - if (do_lstat(path, buffer) < 0) + return do_stat(path, stp); + if (do_lstat(path, stp) < 0) return -1; - if (follow_dirlinks && S_ISLNK(buffer->st_mode)) { + if (follow_dirlinks && S_ISLNK(stp->st_mode)) { STRUCT_STAT st; if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode)) - *buffer = st; + *stp = st; } return 0; #else - return do_stat(path, buffer); + return do_stat(path, stp); #endif } @@ -247,17 +233,21 @@ static int is_excluded(char *fname, int is_dir, int filter_level) static int to_wire_mode(mode_t mode) { #ifdef SUPPORT_LINKS - if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) +#if _S_IFLNK != 0120000 + if (S_ISLNK(mode)) return (mode & ~(_S_IFMT)) | 0120000; #endif - return (int)mode; +#endif + return mode; } static mode_t from_wire_mode(int mode) { - if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) +#if _S_IFLNK != 0120000 + if ((mode & (_S_IFMT)) == 0120000) return (mode & ~(_S_IFMT)) | _S_IFLNK; - return (mode_t)mode; +#endif + return mode; } static void send_directory(int f, struct file_list *flist, @@ -296,7 +286,7 @@ void flist_expand(struct file_list *flist) flist->malloced); if (verbose >= 2 && flist->malloced != FLIST_START) { - rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n", + rprintf(FCLIENT, "[%s] expand file_list to %.0f bytes, did%s move\n", who_am_i(), (double)sizeof flist->files[0] * flist->malloced, (new_ptr == flist->files) ? " not" : ""); @@ -328,15 +318,13 @@ static void send_file_entry(struct file_struct *file, int f) if (!file) { write_byte(f, 0); modtime = 0, mode = 0; - dev = 0, rdev = makedev(0, 0); + dev = 0, rdev = MAKEDEV(0, 0); rdev_major = 0; uid = 0, gid = 0; *lastname = '\0'; return; } - io_write_phase = "send_file_entry"; - f_name(file, fname); flags = file->flags & XMIT_TOP_DIR; @@ -362,7 +350,7 @@ static void send_file_entry(struct file_struct *file, int f) flags |= XMIT_RDEV_MINOR_IS_SMALL; } } else if (protocol_version < 28) - rdev = makedev(0, 0); + rdev = MAKEDEV(0, 0); if (file->uid == uid) flags |= XMIT_SAME_UID; else @@ -462,7 +450,7 @@ static void send_file_entry(struct file_struct *file, int f) #endif #ifdef SUPPORT_HARD_LINKS - if (flags & XMIT_HAS_IDEV_DATA) { + if (file->link_u.idev) { if (protocol_version < 26) { /* 32-bit dev_t and ino_t */ write_int(f, dev); @@ -488,8 +476,6 @@ static void send_file_entry(struct file_struct *file, int f) } strlcpy(lastname, fname, MAXPATHLEN); - - io_write_phase = "unknown"; } static struct file_struct *receive_file_entry(struct file_list *flist, @@ -515,7 +501,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist, if (!flist) { modtime = 0, mode = 0; - dev = 0, rdev = makedev(0, 0); + dev = 0, rdev = MAKEDEV(0, 0); rdev_major = 0; uid = 0, gid = 0; *lastname = '\0'; @@ -548,7 +534,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist, clean_fname(thisname, 0); if (sanitize_paths) - sanitize_path(thisname, thisname, "", 0); + sanitize_path(thisname, thisname, "", 0, NULL); if ((basename = strrchr(thisname, '/')) != NULL) { dirname_len = ++basename - thisname; /* counts future '\0' */ @@ -592,10 +578,10 @@ static struct file_struct *receive_file_entry(struct file_list *flist, rdev_minor = read_byte(f); else rdev_minor = read_int(f); - rdev = makedev(rdev_major, rdev_minor); + rdev = MAKEDEV(rdev_major, rdev_minor); } } else if (protocol_version < 28) - rdev = makedev(0, 0); + rdev = MAKEDEV(0, 0); #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(mode)) { @@ -674,7 +660,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist, file->u.link = bp; read_sbuf(f, bp, linkname_len - 1); if (sanitize_paths) - sanitize_path(bp, bp, "", lastdir_depth); + sanitize_path(bp, bp, "", lastdir_depth, NULL); bp += linkname_len; } #endif @@ -713,12 +699,6 @@ static struct file_struct *receive_file_entry(struct file_list *flist, read_buf(f, sum, checksum_len); } - if (!preserve_perms) { - /* set an appropriate set of permissions based on original - * permissions and umask. This emulates what GNU cp does */ - file->mode &= ~orig_umask; - } - return file; } @@ -761,13 +741,14 @@ struct file_struct *make_file(char *fname, struct file_list *flist, } clean_fname(thisname, 0); if (sanitize_paths) - sanitize_path(thisname, thisname, "", 0); + sanitize_path(thisname, thisname, "", 0, NULL); memset(sum, 0, SUM_LENGTH); - if (stp && S_ISDIR(stp->st_mode)) + if (stp && S_ISDIR(stp->st_mode)) { st = *stp; /* Needed for "symlink/." with --relative. */ - else if (readlink_stat(thisname, &st, linkname) != 0) { + *linkname = '\0'; /* make IBM code checker happy */ + } else if (readlink_stat(thisname, &st, linkname) != 0) { int save_errno = errno; /* See if file is excluded before reporting an error. */ if (filter_level != NO_FILTERS @@ -865,7 +846,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist, ? MD4_SUM_LENGTH : 0; alloc_len = file_struct_len + dirname_len + basename_len - + linkname_len + sum_len; + + linkname_len + sum_len; if (flist) bp = pool_alloc(flist->file_pool, alloc_len, "make_file"); else { @@ -1084,6 +1065,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) int64 start_write; int use_ff_fd = 0; + rprintf(FLOG, "building file list\n"); if (show_filelist_p()) start_filelist_progress("building file list"); @@ -1094,7 +1076,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) io_start_buffering_out(); if (filesfrom_fd >= 0) { - if (argv[0] && !push_dir(argv[0])) { + if (argv[0] && !push_dir(argv[0], 0)) { rsyserr(FERROR, errno, "push_dir %s failed", full_fname(argv[0])); exit_cleanup(RERR_FILESELECT); @@ -1110,13 +1092,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (use_ff_fd) { if (read_filesfrom_line(filesfrom_fd, fbuf) == 0) break; - sanitize_path(fbuf, fbuf, "", 0); + sanitize_path(fbuf, fbuf, "", 0, NULL); } else { if (argc-- == 0) break; strlcpy(fbuf, *argv++, MAXPATHLEN); if (sanitize_paths) - sanitize_path(fbuf, fbuf, "", 0); + sanitize_path(fbuf, fbuf, "", 0, NULL); } len = strlen(fbuf); @@ -1147,7 +1129,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) && (len == 1 || fbuf[len-2] == '/'); } - if (link_stat(fbuf, &st, keep_dirlinks) != 0) { + if (link_stat(fbuf, &st, copy_dirlinks) != 0) { io_error |= IOERR_GENERAL; rsyserr(FERROR, errno, "link_stat %s failed", full_fname(fbuf)); @@ -1204,6 +1186,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } else break; } + 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) { @@ -1228,7 +1212,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) strlcpy(olddir, curr_dir, sizeof olddir); - if (!push_dir(dir)) { + if (!push_dir(dir, 0)) { io_error |= IOERR_GENERAL; rsyserr(FERROR, errno, "push_dir %s failed", full_fname(dir)); @@ -1262,7 +1246,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (fn != p || (*lp && *lp != '/')) { int save_copy_links = copy_links; int save_xfer_dirs = xfer_dirs; - copy_links = copy_unsafe_links; + copy_links |= copy_unsafe_links; xfer_dirs = 1; while ((slash = strchr(slash+1, '/')) != 0) { *slash = '\0'; @@ -1350,6 +1334,7 @@ struct file_list *recv_file_list(int f) unsigned short flags; int64 start_read; + rprintf(FLOG, "receiving file list\n"); if (show_filelist_p()) start_filelist_progress("receiving file list"); @@ -1372,7 +1357,7 @@ struct file_list *recv_file_list(int f) flags |= read_byte(f) << 8; file = receive_file_entry(flist, flags, f); - if (S_ISREG(file->mode)) + if (S_ISREG(file->mode) || S_ISLNK(file->mode)) stats.total_size += file->length; flist->files[flist->count++] = file; @@ -1493,8 +1478,8 @@ void clear_file(struct file_struct *file, struct file_list *flist) 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 - * that we're alone for now since flist_find() will collate adjacent - * items for any entries that are encountered during the find. */ + * 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; } @@ -1777,10 +1762,6 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) c1 = (uchar*)""; } else state1 = s_BASE; - } else if (!*c1) { - type1 = t_path; - state1 = s_SLASH; - c1 = (uchar*)"/"; } else { type1 = t_path; state1 = s_DIR; @@ -1794,10 +1775,6 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) c2 = (uchar*)""; } else state2 = s_BASE; - } else if (!*c2) { - type2 = t_path; - state2 = s_SLASH; - c2 = (uchar*)"/"; } else { type2 = t_path; state2 = s_DIR; @@ -1806,9 +1783,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) if (type1 != type2) return type1 == t_PATH ? 1 : -1; - while (1) { - if ((dif = (int)*c1++ - (int)*c2++) != 0) - break; + do { if (!*c1) { switch (state1) { case s_DIR: @@ -1871,7 +1846,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2) if (type1 != type2) return type1 == t_PATH ? 1 : -1; } - } + } while ((dif = (int)*c1++ - (int)*c2++) == 0); return dif; } @@ -1916,6 +1891,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, struct file_list *dirlist; char dirbuf[MAXPATHLEN]; int save_recurse = recurse; + int save_xfer_dirs = xfer_dirs; if (dlen < 0) { dlen = strlcpy(dirbuf, dirname, MAXPATHLEN); @@ -1927,7 +1903,9 @@ struct file_list *get_dirlist(char *dirname, int dlen, dirlist = flist_new(WITHOUT_HLINK, "get_dirlist"); recurse = 0; + xfer_dirs = 1; send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen); + xfer_dirs = save_xfer_dirs; recurse = save_recurse; if (do_progress) flist_count_offset += dirlist->count;