X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9b25ef35bd8c13480f79753c605f873d9e271936..2b967218eb530c649fe342faab4470a4ad4036d4:/generator.c diff --git a/generator.c b/generator.c index bbc6923f..b3a31f05 100644 --- a/generator.c +++ b/generator.c @@ -7,8 +7,9 @@ * Copyright (C) 2003-2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,8 +17,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ #include "rsync.h" @@ -113,6 +113,7 @@ static int deldelay_fd = -1; static int lull_mod; static int dir_tweaking; static int need_retouch_dir_times; +static int need_retouch_dir_perms; static const char *solo_file = NULL; /* For calling delete_item() and delete_dir_contents(). */ @@ -231,7 +232,7 @@ static enum delret delete_dir_contents(char *fname, int flags) dirlist = get_dirlist(fname, dlen, 0); ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS; - if (!dirlist->count) + if (!dirlist->used) goto done; if (!(flags & DEL_RECURSE)) { @@ -247,7 +248,7 @@ static enum delret delete_dir_contents(char *fname, int flags) /* We do our own recursion, so make delete_item() non-recursive. */ flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY; - for (j = dirlist->count; j--; ) { + for (j = dirlist->used; j--; ) { struct file_struct *fp = dirlist->files[j]; if (fp->flags & FLAG_MOUNT_DIR) { @@ -459,7 +460,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ - for (i = dirlist->count; i--; ) { + for (i = dirlist->used; i--; ) { struct file_struct *fp = dirlist->files[i]; if (!F_IS_ACTIVE(fp)) continue; @@ -494,7 +495,7 @@ static void do_delete_pass(void) if (dry_run > 1 || list_only) return; - for (j = 0; j < cur_flist->count; j++) { + for (j = 0; j < cur_flist->used; j++) { struct file_struct *file = cur_flist->sorted[j]; if (!(file->flags & FLAG_XFER_DIR)) @@ -784,7 +785,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) fname_len = strlen(fname); fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len); - for (j = 0; j < dirlist->count; j++) { + for (j = 0; j < dirlist->used; j++) { struct file_struct *fp = dirlist->files[j]; const char *suf, *name; int len, suf_len; @@ -1262,11 +1263,27 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0) && verbose && code != FNONE && f_out != -1) rprintf(code, "%s/\n", fname); + + /* We need to ensure that the dirs in the transfer have writable + * permissions during the time we are putting files within them. + * This is then fixed after the transfer is done. */ +#ifdef HAVE_CHMOD + if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) { + mode_t mode = file->mode | S_IWUSR; + if (do_chmod(fname, mode) < 0) { + rsyserr(FERROR, errno, + "failed to modify permissions on %s", + full_fname(fname)); + } + need_retouch_dir_perms = 1; + } +#endif + if (real_ret != 0 && one_file_system) real_sx.st.st_dev = filesystem_dev; if (inc_recurse) { if (one_file_system) { - uint32 *devp = F_DIRDEV_P(file); + uint32 *devp = F_DIR_DEV_P(file); DEV_MAJOR(devp) = major(real_sx.st.st_dev); DEV_MINOR(devp) = minor(real_sx.st.st_dev); } @@ -1727,7 +1744,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx) if (ndx < 0) { start = 0; - end = flist->count - 1; + end = flist->used - 1; } else start = end = ndx; @@ -1822,13 +1839,6 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) maybe_flush_socket(1); } - if (delete_during == 2 || !dir_tweaking) { - /* Skip directory touch-up. */ - } else if (first_flist->ndx_start != 0) - touch_up_dirs(dir_flist, first_flist->parent_ndx); - else if (relative_paths && implied_dirs) - touch_up_dirs(first_flist, -1); - flist_free(first_flist); /* updates first_flist */ } } @@ -1839,7 +1849,6 @@ void generate_files(int f_out, const char *local_name) char fbuf[MAXPATHLEN]; int itemizing; enum logcode code; - int need_retouch_dir_perms = 0; int save_do_progress = do_progress; if (protocol_version >= 29) { @@ -1867,7 +1876,7 @@ void generate_files(int f_out, const char *local_name) if (verbose > 2) rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid()); - if (delete_before && !solo_file && cur_flist->count > 0) + if (delete_before && !solo_file && cur_flist->used > 0) do_delete_pass(); if (delete_during == 2) { deldelay_size = BIGPATHBUFLEN * 4; @@ -1895,16 +1904,21 @@ void generate_files(int f_out, const char *local_name) dflt_perms = (ACCESSPERMS & ~orig_umask); do { - if (inc_recurse && delete_during && cur_flist->ndx_start) { + if (inc_recurse && cur_flist->ndx_start) { struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx]; - if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) { - dev_t dirdev; - if (one_file_system) { - uint32 *devp = F_DIRDEV_P(fp); - dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); - } else - dirdev = MAKEDEV(0, 0); - delete_in_dir(f_name(fp, fbuf), fp, &dirdev); + f_name(fp, fbuf); + ndx = cur_flist->ndx_start - 1; + recv_generator(fbuf, fp, ndx, itemizing, code, f_out); + if (delete_during && dry_run < 2) { + if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) { + dev_t dirdev; + if (one_file_system) { + uint32 *devp = F_DIR_DEV_P(fp); + dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); + } else + dirdev = MAKEDEV(0, 0); + delete_in_dir(f_name(fp, fbuf), fp, &dirdev); + } } } for (i = cur_flist->low; i <= cur_flist->high; i++) { @@ -1913,6 +1927,14 @@ void generate_files(int f_out, const char *local_name) if (!F_IS_ACTIVE(file)) continue; + if (inc_recurse && S_ISDIR(file->mode)) { + /* Regular dirs are at the end, so we can stop. */ + if (F_DEPTH(file)) + break; + /* A dot-dir is at the start, so just skip it. */ + continue; + } + #ifdef ICONV_OPTION if (ic_ndx) ndx = F_NDX(file); @@ -1926,24 +1948,6 @@ void generate_files(int f_out, const char *local_name) f_name(file, fbuf); recv_generator(fbuf, file, ndx, itemizing, code, f_out); - /* We need to ensure that any dirs we create have - * writeable permissions during the time we are putting - * files within them. This is then fixed after the - * transfer is done. */ -#ifdef HAVE_CHMOD - if (!am_root && S_ISDIR(file->mode) - && !(file->mode & S_IWUSR) && dir_tweaking) { - mode_t mode = file->mode | S_IWUSR; - const char *fname = solo_file ? solo_file : fbuf; - if (do_chmod(fname, mode) < 0) { - rsyserr(FERROR, errno, - "failed to modify permissions on %s", - full_fname(fname)); - } - need_retouch_dir_perms = 1; - } -#endif - check_for_finished_files(itemizing, code, 0); if (allowed_lull && !(i % lull_mod)) @@ -2012,8 +2016,7 @@ void generate_files(int f_out, const char *local_name) if (delete_after && !solo_file && file_total > 0) do_delete_pass(); - if ((need_retouch_dir_perms || need_retouch_dir_times) - && dir_tweaking && (!inc_recurse || delete_during == 2)) + if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) touch_up_dirs(dir_flist, -1); if (max_delete >= 0 && deletion_count > max_delete) {