X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e5bf3b58558733a233f598ffb580207b7977994d..6191429b509f0bb055a27f44a30b6b0711c4a82d:/generator.c diff --git a/generator.c b/generator.c index f4ecbbd1..d93529cf 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 3 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 @@ -42,7 +43,6 @@ extern int preserve_specials; extern int preserve_hard_links; extern int preserve_perms; extern int preserve_times; -extern int omit_dir_times; extern int uid_ndx; extern int gid_ndx; extern int delete_mode; @@ -81,7 +81,6 @@ extern int copy_dest; extern int link_dest; extern int whole_file; extern int list_only; -extern int new_root_dir; extern int read_batch; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ @@ -553,7 +552,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre { if (statret >= 0) { /* A from-dest-dir statret can == 1! */ int keep_time = !preserve_times ? 0 - : S_ISDIR(file->mode) ? !omit_dir_times + : S_ISDIR(file->mode) ? preserve_times > 1 : !S_ISLNK(file->mode); if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) @@ -881,7 +880,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (!hard_link_one(file, fname, cmpbuf, 1)) goto try_a_copy; if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sxp->st, itemizing, code, j); + finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j); if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { itemize(cmpbuf, file, ndx, 1, sxp, ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, @@ -923,7 +922,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, } #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sxp->st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, -1); #endif return -2; } @@ -1051,7 +1050,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, return j; } if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, NULL, itemizing, code, -1); + finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); } else #endif match_level = 2; @@ -1091,6 +1090,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, { static int missing_below = -1, excluded_below = -1; static const char *parent_dirname = ""; + static struct file_struct *missing_dir = NULL, *excluded_dir = NULL; static struct file_list *fuzzy_dirlist = NULL; static int need_fuzzy_dirlist = 0; struct file_struct *fuzzy_file = NULL; @@ -1102,6 +1102,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, char *fnamecmp, *partialptr, *backupptr = NULL; char fnamecmpbuf[MAXPATHLEN]; uchar fnamecmp_type; + int implied_dirs_are_missing = relative_paths && !implied_dirs && !inc_recurse; int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0; if (list_only) @@ -1112,14 +1113,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (server_filter_list.head) { if (excluded_below >= 0) { - if (F_DEPTH(file) > excluded_below) + if (F_DEPTH(file) > excluded_below + && (!implied_dirs_are_missing || f_name_has_prefix(file, excluded_dir))) goto skipping; excluded_below = -1; } if (check_filter(&server_filter_list, fname, S_ISDIR(file->mode)) < 0) { - if (S_ISDIR(file->mode)) + if (S_ISDIR(file->mode)) { excluded_below = F_DEPTH(file); + excluded_dir = file; + } skipping: if (verbose) { rprintf(FINFO, @@ -1131,7 +1135,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (missing_below >= 0) { - if (F_DEPTH(file) <= missing_below) { + if (F_DEPTH(file) <= missing_below + || (implied_dirs_are_missing && !f_name_has_prefix(file, missing_dir))) { if (dry_run) dry_run--; missing_below = -1; @@ -1200,6 +1205,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (dry_run) dry_run++; missing_below = F_DEPTH(file); + missing_dir = file; } file->flags |= FLAG_MISSING_DIR; } @@ -1207,6 +1213,22 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (S_ISDIR(file->mode)) { + if (!implied_dirs && !(file->flags & FLAG_XFER_DIR)) + goto cleanup; + if (inc_recurse && ndx != cur_flist->ndx_start - 1) { + /* In inc_recurse mode we want ot make sure any missing + * directories get created while we're still processing + * the parent dir (which allows us to touch the parent + * dir's mtime right away). We will handle the dir in + * full later (right before we handle its contents). */ + if (statret == 0 + && (S_ISDIR(sx.st.st_mode) + || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)) + goto cleanup; /* Any errors get reported later. */ + if (do_mkdir(fname, file->mode & 0700) == 0) + file->flags |= FLAG_DIR_CREATED; + goto cleanup; + } /* The file to be received is a directory, so we need * to prepare appropriately. If there is already a * file of that name and it is *not* a directory, then @@ -1214,20 +1236,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(sx.st.st_mode)) { if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0) - return; + goto skipping_dir_contents; statret = -1; } if (dry_run && statret != 0 && missing_below < 0) { missing_below = F_DEPTH(file); + missing_dir = file; dry_run++; } real_ret = statret; real_sx = sx; - if (new_root_dir) { - if (*fname == '.' && fname[1] == '\0') - statret = -1; - new_root_dir = 0; - } + if (file->flags & FLAG_DIR_CREATED) + statret = -1; if (!preserve_perms) { /* See comment in non-dir code below. */ file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, statret == 0); @@ -1252,9 +1272,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", full_fname(fname)); + skipping_dir_contents: rprintf(FERROR, "*** Skipping any contents from this failed directory ***\n"); missing_below = F_DEPTH(file); + missing_dir = file; file->flags |= FLAG_MISSING_DIR; goto cleanup; } @@ -1282,7 +1304,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, 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); } @@ -1334,7 +1356,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(fname, file, ndx, 0, &sx, 0, 0, NULL); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sx.st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); #endif if (remove_source_files == 1) goto return_with_success; @@ -1361,8 +1383,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = 1; } #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { + cur_flist->in_progress++; goto cleanup; + } #endif if (do_symlink(sl, fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", @@ -1377,7 +1401,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(code, "%s -> %s\n", fname, sl); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, NULL, itemizing, code, -1); + finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); #endif /* This does not check remove_source_files == 1 * because this is one of the items that the old @@ -1413,7 +1437,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(fname, file, ndx, 0, &sx, 0, 0, NULL); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sx.st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); #endif if (remove_source_files == 1) goto return_with_success; @@ -1438,8 +1462,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = 1; } #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { + cur_flist->in_progress++; goto cleanup; + } #endif if (verbose > 2) { rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n", @@ -1459,7 +1485,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(code, "%s\n", fname); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, NULL, itemizing, code, -1); + finish_hard_link(file, fname, ndx, NULL, itemizing, code, -1); #endif if (remove_source_files == 1) goto return_with_success; @@ -1558,8 +1584,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (statret != 0) { #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { + cur_flist->in_progress++; goto cleanup; + } #endif if (stat_errno == ENOENT) goto notify_others; @@ -1568,7 +1596,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto cleanup; } - if (append_mode > 0 && sx.st.st_size > F_LENGTH(file)) + if (append_mode > 0 && sx.st.st_size >= F_LENGTH(file)) goto cleanup; if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) @@ -1585,7 +1613,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL); #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sx.st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); #endif if (remove_source_files != 1) goto cleanup; @@ -1621,8 +1649,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, pretend_missing: /* pretend the file didn't exist */ #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) { + cur_flist->in_progress++; goto cleanup; + } #endif statret = real_ret = -1; goto notify_others; @@ -1696,7 +1726,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (!do_xfers) { #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sx.st, itemizing, code, -1); + finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1); #endif goto cleanup; } @@ -1751,15 +1781,16 @@ static void touch_up_dirs(struct file_list *flist, int ndx) * transfer and/or re-set any tweaked modified-time values. */ for (i = start; i <= end; i++, counter++) { file = flist->files[i]; + if (!S_ISDIR(file->mode) + || (relative_paths && !implied_dirs && !(file->flags & FLAG_XFER_DIR))) + continue; if (verbose > 3) { fname = f_name(file, NULL); rprintf(FINFO, "touch_up_dirs: %s (%d)\n", NS(fname), i); } - if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode) - || file->flags & FLAG_MISSING_DIR) - continue; - if (!need_retouch_dir_times && file->mode & S_IWUSR) + if (!F_IS_ACTIVE(file) || file->flags & FLAG_MISSING_DIR + || (!need_retouch_dir_times && file->mode & S_IWUSR)) continue; fname = f_name(file, NULL); if (!(file->mode & S_IWUSR)) @@ -1784,9 +1815,9 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) while (preserve_hard_links && (ndx = get_hlink_num()) != -1) { flist = flist_for_ndx(ndx); assert(flist != NULL); - file = flist->files[ndx]; + file = flist->files[ndx - flist->ndx_start]; assert(file->flags & FLAG_HLINKED); - finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1); + finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1); } #endif @@ -1842,8 +1873,6 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) /* 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 */ } @@ -1876,7 +1905,7 @@ void generate_files(int f_out, const char *local_name) } solo_file = local_name; dir_tweaking = !(list_only || solo_file || dry_run); - need_retouch_dir_times = preserve_times && !omit_dir_times; + need_retouch_dir_times = preserve_times > 1; lull_mod = allowed_lull * 5; if (verbose > 2) @@ -1910,16 +1939,23 @@ void generate_files(int f_out, const char *local_name) dflt_perms = (ACCESSPERMS & ~orig_umask); do { +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && inc_recurse) { + while (!flist_eof && file_total < FILECNT_LOOKAHEAD/2) + wait_for_receiver(); + } +#endif + if (inc_recurse && cur_flist->ndx_start) { struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx]; f_name(fp, fbuf); ndx = cur_flist->ndx_start - 1; recv_generator(fbuf, fp, ndx, itemizing, code, f_out); - if (delete_during) { + 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_DIRDEV_P(fp); + uint32 *devp = F_DIR_DEV_P(fp); dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); } else dirdev = MAKEDEV(0, 0); @@ -1933,14 +1969,6 @@ 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);