X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c0b134a445a12a98c70313ce18b94858ef9a4b77..ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d:/flist.c diff --git a/flist.c b/flist.c index dc283a1f..501a02ea 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,22 +38,21 @@ 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; extern int preserve_gid; extern int relative_paths; extern int implied_dirs; -extern int skip_empty_dirs; +extern int prune_empty_dirs; 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; @@ -76,7 +70,6 @@ unsigned int file_struct_len; static char empty_sum[MD4_SUM_LENGTH]; static int flist_count_offset; -static int max_dir_depth = 0; static void clean_flist(struct file_list *flist, int strip_root, int no_dups); static void output_flist(struct file_list *flist); @@ -131,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. +/* 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 -1 on error + * 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. * - * @retval 0 for success - * - * @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 safe_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 safe_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; + if (safe_stat(path, &st) == 0 && S_ISDIR(st.st_mode)) + *stp = st; } return 0; #else - return do_stat(path, buffer); + return do_stat(path, stp); #endif } @@ -336,8 +321,6 @@ static void send_file_entry(struct file_struct *file, int f) return; } - io_write_phase = "send_file_entry"; - f_name(file, fname); flags = file->flags & XMIT_TOP_DIR; @@ -489,8 +472,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, @@ -549,7 +530,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' */ @@ -635,8 +616,6 @@ static struct file_struct *receive_file_entry(struct file_list *flist, bp[-1] = '\0'; lastdir_depth = count_dir_elements(lastdir); file->dir.depth = lastdir_depth + 1; - if (lastdir_depth >= max_dir_depth) - max_dir_depth = lastdir_depth + 1; } else if (dirname) { file->dirname = dirname; /* we're reusing lastname */ file->dir.depth = lastdir_depth + 1; @@ -676,8 +655,6 @@ static struct file_struct *receive_file_entry(struct file_list *flist, if (linkname_len) { file->u.link = bp; read_sbuf(f, bp, linkname_len - 1); - if (sanitize_paths) - sanitize_path(bp, bp, "", lastdir_depth); bp += linkname_len; } #endif @@ -716,12 +693,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; } @@ -764,7 +735,7 @@ 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); @@ -868,7 +839,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 { @@ -949,7 +920,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist, int save_mode = file->mode; file->mode = S_IFDIR; /* Find a directory with our name. */ if (flist_find(the_file_list, file) >= 0 - && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) { + && safe_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) { file->modtime = st2.st_mtime; file->length = st2.st_size; file->mode = st2.st_mode; @@ -1097,6 +1068,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) io_start_buffering_out(); if (filesfrom_fd >= 0) { + if (sanitize_paths) + die_on_unsafe_path(argv[0], 0); if (argv[0] && !push_dir(argv[0])) { rsyserr(FERROR, errno, "push_dir %s failed", full_fname(argv[0])); @@ -1113,13 +1086,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); @@ -1150,7 +1123,9 @@ 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 (sanitize_paths) + die_on_unsafe_path(fbuf, 1); + if (link_stat(fbuf, &st, copy_dirlinks) != 0) { io_error |= IOERR_GENERAL; rsyserr(FERROR, errno, "link_stat %s failed", full_fname(fbuf)); @@ -1265,7 +1240,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'; @@ -1375,7 +1350,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; @@ -1439,45 +1414,48 @@ static int file_compare(struct file_struct **file1, struct file_struct **file2) int flist_find(struct file_list *flist, struct file_struct *f) { int low = flist->low, high = flist->high; - int ret, mid, mid_up; + int diff, mid, mid_up; while (low <= high) { mid = (low + high) / 2; if (flist->files[mid]->basename) mid_up = mid; - else if (flist->files[mid]->dir.depth) { + else { + /* Scan for the next non-empty entry using the cached + * distance values. If the value isn't fully up-to- + * date, update it. */ mid_up = mid + flist->files[mid]->dir.depth; - if (mid_up < mid) { - high = mid_up; - continue; + if (!flist->files[mid_up]->basename) { + do { + mid_up += flist->files[mid_up]->dir.depth; + } while (!flist->files[mid_up]->basename); + flist->files[mid]->dir.depth = mid_up - mid; } - } else { - /* Scan for the next non-empty entry and cache - * the distance so we never do this again. */ - mid_up = mid; - while (++mid_up <= high - && !flist->files[mid_up]->basename) {} if (mid_up > high) { - high = mid; - while (--high >= low - && !flist->files[high]->basename) {} - flist->files[mid]->dir.depth = high - mid; + /* If there's nothing left above us, set high to + * a non-empty entry below us and continue. */ + high = mid - flist->files[mid]->length; + if (!flist->files[high]->basename) { + do { + high -= flist->files[high]->length; + } while (!flist->files[high]->basename); + flist->files[mid]->length = mid - high; + } continue; } - flist->files[mid]->dir.depth = mid_up - mid; } - ret = f_name_cmp(flist->files[mid_up], f); - if (ret == 0) { + diff = f_name_cmp(flist->files[mid_up], f); + if (diff == 0) { if (protocol_version < 29 && S_ISDIR(flist->files[mid_up]->mode) != S_ISDIR(f->mode)) return -1; return mid_up; } - if (ret > 0) - high = mid - 1; - else + if (diff < 0) low = mid_up + 1; + else + high = mid - 1; } return -1; } @@ -1486,11 +1464,16 @@ int flist_find(struct file_list *flist, struct file_struct *f) * Free up any resources a file_struct has allocated * and clear the file. */ -void clear_file(int i, struct file_list *flist) +void clear_file(struct file_struct *file, struct file_list *flist) { - if (flist->hlink_pool && flist->files[i]->link_u.idev) - pool_free(flist->hlink_pool, 0, flist->files[i]->link_u.idev); - memset(flist->files[i], 0, file_struct_len); + if (flist->hlink_pool && file->link_u.idev) + pool_free(flist->hlink_pool, 0, file->link_u.idev); + memset(file, 0, file_struct_len); + /* In an empty entry, dir.depth is an offset to the next non-empty + * entry. Likewise for length in the opposite direction. We assume + * 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; } /* @@ -1538,6 +1521,7 @@ void flist_free(struct file_list *flist) */ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) { + char fbuf[MAXPATHLEN]; int i, prev_i = 0; if (!flist) @@ -1591,14 +1575,14 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) if (verbose > 1 && !am_server) { rprintf(FINFO, "removing duplicate name %s from file list (%d)\n", - f_name(file, NULL), drop); + f_name(file, fbuf), drop); } /* Make sure we don't lose track of a user-specified * top directory. */ flist->files[keep]->flags |= flist->files[drop]->flags & (FLAG_TOP_DIR|FLAG_DEL_HERE); - clear_file(drop, flist); + clear_file(flist->files[drop], flist); if (keep == i) { if (flist->low == drop) { @@ -1629,33 +1613,58 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) } } - if (skip_empty_dirs && no_dups && max_dir_depth) { - int j, cur_depth = 0; - int *maybe_dirs = new_array(int, max_dir_depth); + if (prune_empty_dirs && no_dups) { + int j, prev_depth = 0; - maybe_dirs[0] = -1; + prev_i = 0; /* It's OK that this isn't really true. */ for (i = flist->low; i <= flist->high; i++) { - struct file_struct *file = flist->files[i]; + struct file_struct *fp, *file = flist->files[i]; + /* This temporarily abuses the dir.depth value for a + * directory that is in a chain that might get pruned. + * We restore the old value if it gets a reprieve. */ if (S_ISDIR(file->mode) && file->dir.depth) { - j = cur_depth; - cur_depth = file->dir.depth - 1; - for ( ; j >= cur_depth; j--) { - if (maybe_dirs[j] < 0) - continue; - clear_file(maybe_dirs[j], flist); + /* Dump empty dirs when coming back down. */ + for (j = prev_depth; j >= file->dir.depth; j--) { + fp = flist->files[prev_i]; + if (fp->dir.depth >= 0) + break; + prev_i = -fp->dir.depth-1; + clear_file(fp, flist); + } + prev_depth = file->dir.depth; + if (is_excluded(f_name(file, fbuf), 1, + ALL_FILTERS)) { + /* Keep dirs through this dir. */ + for (j = prev_depth-1; ; j--) { + fp = flist->files[prev_i]; + if (fp->dir.depth >= 0) + break; + prev_i = -fp->dir.depth-1; + fp->dir.depth = j; + } + } else + file->dir.depth = -prev_i-1; + prev_i = i; + } else { + /* Keep dirs through this non-dir. */ + for (j = prev_depth; ; j--) { + fp = flist->files[prev_i]; + if (fp->dir.depth >= 0) + break; + prev_i = -fp->dir.depth-1; + fp->dir.depth = j; } - maybe_dirs[cur_depth] = i; - } else if (maybe_dirs[cur_depth] >= 0) { - for (j = 0; j <= cur_depth; j++) - maybe_dirs[j] = -1; } } - for (j = cur_depth; j >= 0; j--) { - if (maybe_dirs[j] < 0) - continue; - clear_file(maybe_dirs[j], flist); + /* Dump empty all remaining empty dirs. */ + while (1) { + struct file_struct *fp = flist->files[prev_i]; + if (fp->dir.depth >= 0) + break; + prev_i = -fp->dir.depth-1; + clear_file(fp, flist); } for (i = flist->low; i <= flist->high; i++) { @@ -1885,6 +1894,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); @@ -1896,7 +1906,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;