X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/82ad07c4182f744c07b96a15df4572e559ed7dc8..16edf86595a5a990a942fa045dfb523dae1fe6cb:/generator.c diff --git a/generator.c b/generator.c index 536302f1..09c6b7d2 100644 --- a/generator.c +++ b/generator.c @@ -4,12 +4,11 @@ * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2002 Martin Pool - * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * 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 as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -31,10 +30,13 @@ extern int logfile_format_has_i; extern int am_root; extern int am_server; extern int am_daemon; +extern int inc_recurse; extern int do_progress; extern int relative_paths; extern int implied_dirs; extern int keep_dirlinks; +extern int preserve_acls; +extern int preserve_xattrs; extern int preserve_links; extern int preserve_devices; extern int preserve_specials; @@ -48,9 +50,8 @@ extern int delete_mode; extern int delete_before; extern int delete_during; extern int delete_after; -extern int module_id; +extern int msgdone_cnt; extern int ignore_errors; -extern int flist_extra_ndx; extern int remove_source_files; extern int delay_updates; extern int update_only; @@ -65,10 +66,12 @@ extern int size_only; extern OFF_T max_size; extern OFF_T min_size; extern int io_error; +extern int flist_eof; extern int allowed_lull; extern int sock_f_out; extern int ignore_timeout; extern int protocol_version; +extern int file_total; extern int fuzzy_basis; extern int always_checksum; extern int checksum_len; @@ -86,20 +89,28 @@ extern long block_size; /* "long" because popt can't set an int32. */ extern int max_delete; extern int force_delete; extern int one_file_system; -extern int file_struct_len; extern struct stats stats; extern dev_t filesystem_dev; +extern mode_t orig_umask; extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; -extern struct file_list *the_file_list; +extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct server_filter_list; int ignore_perishable = 0; int non_perishable_cnt = 0; +int maybe_ATTRS_REPORT = 0; +static dev_t dev_zero; static int deletion_count = 0; /* used to implement --max-delete */ -static FILE *delete_delay_fp = NULL; +static int deldelay_size = 0, deldelay_cnt = 0; +static char *deldelay_buf = NULL; +static int deldelay_fd = -1; +static int lull_mod; +static int dir_tweaking; +static int need_retouch_dir_times; +static const char *solo_file = NULL; /* For calling delete_item() and delete_dir_contents(). */ #define DEL_RECURSE (1<<1) /* recurse */ @@ -156,7 +167,7 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) if (S_ISDIR(mode)) { what = "rmdir"; ok = do_rmdir(fbuf) == 0; - } else if (make_backups && (backup_dir || !is_backup_file(fbuf))) { + } else if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) { what = "make_backup"; ok = make_backup(fbuf); } else { @@ -268,67 +279,135 @@ static enum delret delete_dir_contents(char *fname, int flags) return ret; } -static void start_delete_temp(void) +static int start_delete_delay_temp(void) { char fnametmp[MAXPATHLEN]; - int fd, save_dry_run = dry_run; + int save_dry_run = dry_run; dry_run = 0; if (!get_tmpname(fnametmp, "deldelay") - || (fd = do_mkstemp(fnametmp, 0600)) < 0 - || !(delete_delay_fp = fdopen(fd, "w+"))) { - rprintf(FERROR, "Unable to create delete-delay temp file.\n"); - exit_cleanup(RERR_FILEIO); + || (deldelay_fd = do_mkstemp(fnametmp, 0600)) < 0) { + rprintf(FINFO, "NOTE: Unable to create delete-delay temp file%s.\n", + inc_recurse ? "" : " -- switching to --delete-after"); + delete_during = 0; + delete_after = !inc_recurse; + dry_run = save_dry_run; + return 0; } - dry_run = save_dry_run; unlink(fnametmp); + dry_run = save_dry_run; + return 1; +} + +static int flush_delete_delay(void) +{ + if (write(deldelay_fd, deldelay_buf, deldelay_cnt) != deldelay_cnt) { + rsyserr(FERROR, errno, "flush of delete-delay buffer"); + delete_during = 0; + delete_after = 1; + close(deldelay_fd); + return 0; + } + deldelay_cnt = 0; + return 1; } -static int read_delay_line(FILE *fp, char *buf, int bsize) +static int remember_delete(struct file_struct *file, const char *fname) { - int ch, mode = 0; + int len; + + while (1) { + len = snprintf(deldelay_buf + deldelay_cnt, + deldelay_size - deldelay_cnt, + "%x %s%c", (int)file->mode, fname, '\0'); + if ((deldelay_cnt += len) <= deldelay_size) + break; + if (deldelay_fd < 0 && !start_delete_delay_temp()) + return 0; + deldelay_cnt -= len; + if (!flush_delete_delay()) + return 0; + } - if ((ch = fgetc(fp)) == EOF) - return -1; + return 1; +} + +static int read_delay_line(char *buf) +{ + static int read_pos = 0; + int j, len, mode; + char *bp, *past_space; while (1) { - if (ch == ' ') + for (j = read_pos; j < deldelay_cnt && deldelay_buf[j]; j++) {} + if (j < deldelay_cnt) break; - if (ch > '7' || ch < '0') { - rprintf(FERROR, "invalid data in delete-delay file.\n"); - exit_cleanup(RERR_FILEIO); + if (deldelay_fd < 0) { + if (j > read_pos) + goto invalid_data; + return -1; + } + deldelay_cnt -= read_pos; + if (deldelay_cnt == deldelay_size) + goto invalid_data; + if (deldelay_cnt && read_pos) { + memmove(deldelay_buf, deldelay_buf + read_pos, + deldelay_cnt); } - mode = mode*8 + ch - '0'; - if ((ch = fgetc(fp)) == EOF) { - unexpected_eof: - rprintf(FERROR, "unexpected EOF in delete-delay file.\n"); - exit_cleanup(RERR_FILEIO); + len = read(deldelay_fd, deldelay_buf + deldelay_cnt, + deldelay_size - deldelay_cnt); + if (len == 0) { + if (deldelay_cnt) { + rprintf(FERROR, + "ERROR: unexpected EOF in delete-delay file.\n"); + } + return -1; + } + if (len < 0) { + rsyserr(FERROR, errno, + "reading delete-delay file"); + return -1; } + deldelay_cnt += len; + read_pos = 0; } - while (1) { - if ((ch = fgetc(fp)) == EOF) - goto unexpected_eof; - if (bsize-- <= 0) { - rprintf(FERROR, "filename too long in delete-delay file.\n"); - exit_cleanup(RERR_FILEIO); - } - *buf++ = (char)ch; - if (ch == '\0') - break; + bp = deldelay_buf + read_pos; + + if (sscanf(bp, "%x ", &mode) != 1) { + invalid_data: + rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n"); + return -1; + } + past_space = strchr(bp, ' ') + 1; + len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */ + read_pos = j + 1; + + if (len > MAXPATHLEN) { + rprintf(FERROR, "ERROR: filename too long in delete-delay file.\n"); + return -1; } + /* The caller needs the name in a MAXPATHLEN buffer, so we copy it + * instead of returning a pointer to our buffer. */ + memcpy(buf, past_space, len); + return mode; } -static void delayed_deletions(char *delbuf) +static void do_delayed_deletions(char *delbuf) { int mode; - fseek(delete_delay_fp, 0, 0); - while ((mode = read_delay_line(delete_delay_fp, delbuf, MAXPATHLEN)) >= 0) + if (deldelay_fd >= 0) { + if (deldelay_cnt && !flush_delete_delay()) + return; + lseek(deldelay_fd, 0, 0); + } + while ((mode = read_delay_line(delbuf)) >= 0) delete_item(delbuf, mode, NULL, DEL_RECURSE); - fclose(delete_delay_fp); + if (deldelay_fd >= 0) + close(deldelay_fd); } /* This function is used to implement per-directory deletion, and is used by @@ -337,20 +416,15 @@ static void delayed_deletions(char *delbuf) * call will append names onto the end, but the old dir value will be restored * on exit). */ static void delete_in_dir(struct file_list *flist, char *fbuf, - struct file_struct *file, STRUCT_STAT *stp) + struct file_struct *file, dev_t *fs_dev) { - static int min_depth = MAXPATHLEN, cur_depth = -1; - static void *filt_array[MAXPATHLEN/2+1]; static int already_warned = 0; struct file_list *dirlist; char delbuf[MAXPATHLEN]; int dlen, i; if (!flist) { - while (cur_depth >= min_depth) - pop_local_filters(filt_array[cur_depth--]); - min_depth = MAXPATHLEN; - cur_depth = -1; + change_local_filter_dir(NULL, 0, 0); return; } @@ -360,10 +434,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, if (allowed_lull) maybe_send_keepalive(); - if (file->dir.depth >= MAXPATHLEN/2+1) - return; /* Impossible... */ - - if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { + if (io_error && !ignore_errors) { if (already_warned) return; rprintf(FINFO, @@ -372,18 +443,13 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, return; } - while (cur_depth >= file->dir.depth && cur_depth >= min_depth) - pop_local_filters(filt_array[cur_depth--]); - cur_depth = file->dir.depth; - if (min_depth > cur_depth) - min_depth = cur_depth; dlen = strlen(fbuf); - filt_array[cur_depth] = push_local_filters(fbuf, dlen); + change_local_filter_dir(fbuf, dlen, F_DEPTH(file)); if (one_file_system) { if (file->flags & FLAG_TOP_DIR) - filesystem_dev = stp->st_dev; - else if (filesystem_dev != stp->st_dev) + filesystem_dev = *fs_dev; + else if (filesystem_dev != *fs_dev) return; } @@ -393,7 +459,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, * from the filesystem. */ for (i = dirlist->count; i--; ) { struct file_struct *fp = dirlist->files[i]; - if (!fp->basename) + if (!F_IS_ACTIVE(fp)) continue; if (fp->flags & FLAG_MOUNT_DIR) { if (verbose > 1) @@ -403,9 +469,10 @@ static void delete_in_dir(struct file_list *flist, char *fbuf, } if (flist_find(flist, fp) < 0) { f_name(fp, delbuf); - if (delete_delay_fp) - fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0'); - else + if (delete_during == 2) { + if (!remember_delete(fp, delbuf)) + break; + } else delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); } } @@ -439,65 +506,107 @@ static void do_delete_pass(struct file_list *flist) || !S_ISDIR(st.st_mode)) continue; - delete_in_dir(flist, fbuf, file, &st); + delete_in_dir(flist, fbuf, file, &st.st_dev); } - delete_in_dir(NULL, NULL, NULL, NULL); + delete_in_dir(NULL, NULL, NULL, &dev_zero); if (do_progress && !am_server) rprintf(FINFO, " \r"); } -int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) +int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp) { - if (preserve_perms - && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) + if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) return 0; - if (am_root && preserve_uid && st->st_uid != F_UID(file)) + if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file)) return 0; - if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file)) + if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file)) return 0; +#ifdef SUPPORT_ACLS + if (preserve_acls && !S_ISLNK(file->mode)) { + if (!ACL_READY(*sxp)) + get_acl(fname, sxp); + if (set_acl(NULL, file, sxp) == 0) + return 0; + } +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) { + if (!XATTR_READY(*sxp)) + get_xattr(fname, sxp); + if (xattr_diff(file, sxp, 0)) + return 0; + } +#endif + return 1; } -void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, - int32 iflags, uchar fnamecmp_type, const char *xname) +void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statret, + statx *sxp, int32 iflags, uchar fnamecmp_type, + const char *xname) { if (statret >= 0) { /* A from-dest-dir statret can == 1! */ int keep_time = !preserve_times ? 0 : S_ISDIR(file->mode) ? !omit_dir_times : !S_ISLNK(file->mode); - if (S_ISREG(file->mode) && file->length != st->st_size) + if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) iflags |= ITEM_REPORT_SIZE; if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time && !(iflags & ITEM_MATCHED) && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) + || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0)) iflags |= ITEM_REPORT_TIME; - if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) + if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && F_UID(file) != st->st_uid) + if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid) iflags |= ITEM_REPORT_OWNER; if (preserve_gid && F_GID(file) != GID_NONE - && st->st_gid != F_GID(file)) + && sxp->st.st_gid != F_GID(file)) iflags |= ITEM_REPORT_GROUP; - } else +#ifdef SUPPORT_ACLS + if (preserve_acls && !S_ISLNK(file->mode)) { + if (!ACL_READY(*sxp)) + get_acl(fnamecmp, sxp); + if (set_acl(NULL, file, sxp) == 0) + iflags |= ITEM_REPORT_ACL; + } +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) { + if (!XATTR_READY(*sxp)) + get_xattr(fnamecmp, sxp); + if (xattr_diff(file, sxp, 1)) + iflags |= ITEM_REPORT_XATTR; + } +#endif + } else { +#ifdef SUPPORT_XATTRS + if (preserve_xattrs && xattr_diff(file, NULL, 1)) + iflags |= ITEM_REPORT_XATTR; +#endif iflags |= ITEM_IS_NEW; + } iflags &= 0xffff; - if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1 + if ((iflags & (SIGNIFICANT_ITEM_FLAGS|ITEM_REPORT_XATTR) || verbose > 1 || stdout_format_has_i > 1 || (xname && *xname)) && !read_batch) { if (protocol_version >= 29) { if (ndx >= 0) - write_int(sock_f_out, ndx); + write_ndx(sock_f_out, ndx); write_shortint(sock_f_out, iflags); if (iflags & ITEM_BASIS_TYPE_FOLLOWS) write_byte(sock_f_out, fnamecmp_type); if (iflags & ITEM_XNAME_FOLLOWS) write_vstring(sock_f_out, xname, strlen(xname)); +#ifdef SUPPORT_XATTRS + if (iflags & ITEM_REPORT_XATTR && !dry_run) + send_xattr_request(NULL, file, sock_f_out); +#endif } else if (ndx >= 0) { enum logcode code = logfile_format_has_i ? FINFO : FCLIENT; log_item(code, file, &stats, iflags, xname); @@ -509,18 +618,18 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st, /* Perform our quick-check heuristic for determining if a file is unchanged. */ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) { - if (st->st_size != file->length) + if (st->st_size != F_LENGTH(file)) return 0; /* if always checksum is set then we use the checksum instead of the file time to determine whether to sync */ - if (always_checksum && S_ISREG(st->st_mode)) { - char sum[MD4_SUM_LENGTH]; + if (always_checksum > 0 && S_ISREG(st->st_mode)) { + char sum[MAX_DIGEST_LEN]; file_checksum(fn, sum, st->st_size); return memcmp(sum, F_SUM(file), checksum_len) == 0; } - if (size_only) + if (size_only > 0) return 1; if (ignore_times) @@ -679,12 +788,13 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) int len, suf_len; uint32 dist; - if (!S_ISREG(fp->mode) || !fp->length || fp->flags & FLAG_SENT) + if (!S_ISREG(fp->mode) || !F_LENGTH(fp) + || fp->flags & FLAG_FILE_SENT) continue; name = fp->basename; - if (fp->length == file->length + if (F_LENGTH(fp) == F_LENGTH(file) && cmp_time(fp->modtime, file->modtime) == 0) { if (verbose > 4) { rprintf(FINFO, @@ -714,29 +824,12 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist) return lowest_j; } -void check_for_finished_hlinks(int itemizing, enum logcode code) -{ - struct file_struct *file; - int ndx; - - while ((ndx = get_hlink_num()) != -1) { - if (ndx < 0 || ndx >= the_file_list->count) - continue; - - file = the_file_list->files[ndx]; - if (!IS_HLINKED(file)) - continue; - - hard_link_cluster(file, ndx, itemizing, code, -1); - } -} - /* This is only called for regular files. We return -2 if we've finished * handling the file, -1 if no dest-linking occurred, or a non-negative * value if we found an alternate basis file. */ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, - char *cmpbuf, STRUCT_STAT *stp, int itemizing, - int maybe_ATTRS_REPORT, enum logcode code) + char *cmpbuf, statx *sxp, int itemizing, + enum logcode code) { int best_match = -1; int match_level = 0; @@ -744,7 +837,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, do { pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); - if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode)) + if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode)) continue; switch (match_level) { case 0: @@ -752,16 +845,16 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, match_level = 1; /* FALL THROUGH */ case 1: - if (!unchanged_file(cmpbuf, file, stp)) + if (!unchanged_file(cmpbuf, file, &sxp->st)) continue; best_match = j; match_level = 2; /* FALL THROUGH */ case 2: - if (!unchanged_attrs(file, stp)) + if (!unchanged_attrs(cmpbuf, file, sxp)) continue; - if (always_checksum && preserve_times - && cmp_time(stp->st_mtime, file->modtime)) + if (always_checksum > 0 && preserve_times + && cmp_time(sxp->st.st_mtime, file->modtime)) continue; best_match = j; match_level = 3; @@ -776,31 +869,35 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (j != best_match) { j = best_match; pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); - if (link_stat(cmpbuf, stp, 0) < 0) + if (link_stat(cmpbuf, &sxp->st, 0) < 0) return -1; } if (match_level == 3 && !copy_dest) { #ifdef SUPPORT_HARD_LINKS if (link_dest) { - int i = itemizing && (verbose > 1 || stdout_format_has_i > 1); - if (hard_link_one(file, ndx, fname, 0, stp, - cmpbuf, 1, i, code) < 0) + if (!hard_link_one(file, fname, cmpbuf, 1)) goto try_a_copy; - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, j); + if (preserve_hard_links && F_IS_HLINKED(file)) + finish_hard_link(file, fname, &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, + 0, ""); + } } else #endif if (itemizing) - itemize(file, ndx, 0, stp, 0, 0, NULL); - if (verbose > 1 && maybe_ATTRS_REPORT) { + itemize(cmpbuf, file, ndx, 0, sxp, 0, 0, NULL); + if (verbose > 1 && maybe_ATTRS_REPORT) rprintf(FCLIENT, "%s is uptodate\n", fname); - } return -2; } if (match_level >= 2) { +#ifdef SUPPORT_HARD_LINKS try_a_copy: /* Copy the file locally. */ +#endif if (copy_file(cmpbuf, fname, file->mode) < 0) { if (verbose) { rsyserr(FINFO, errno, "copy_file %s => %s", @@ -808,9 +905,13 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, } return -1; } + set_file_attrs(fname, file, NULL, cmpbuf, 0); if (itemizing) - itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL); - set_file_attrs(fname, file, NULL, 0); + itemize(cmpbuf, file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL); +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + xattr_clear_locals(file); +#endif if (maybe_ATTRS_REPORT && ((!itemizing && verbose && match_level == 2) || (verbose > 1 && match_level == 3))) { @@ -818,8 +919,10 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, rprintf(code, "%s%s\n", fname, match_level == 3 ? " is uptodate" : ""); } - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, j); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_IS_HLINKED(file)) + finish_hard_link(file, fname, &sxp->st, itemizing, code, -1); +#endif return -2; } @@ -830,13 +933,14 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, * handling the file, or -1 if no dest-linking occurred, or a non-negative * value if we found an alternate basis file. */ static int try_dests_non(struct file_struct *file, char *fname, int ndx, - char *cmpbuf, STRUCT_STAT *stp, int itemizing, - int maybe_ATTRS_REPORT, enum logcode code) + char *cmpbuf, statx *sxp, int itemizing, + enum logcode code) { char lnk[MAXPATHLEN]; int best_match = -1; int match_level = 0; enum nonregtype type; + uint32 *devp; int len, j = 0; #ifndef SUPPORT_LINKS @@ -862,24 +966,24 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, do { pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); - if (link_stat(cmpbuf, stp, 0) < 0) + if (link_stat(cmpbuf, &sxp->st, 0) < 0) continue; switch (type) { case TYPE_DIR: - if (!S_ISDIR(stp->st_mode)) + if (!S_ISDIR(sxp->st.st_mode)) continue; break; case TYPE_SPECIAL: - if (!IS_SPECIAL(stp->st_mode)) + if (!IS_SPECIAL(sxp->st.st_mode)) continue; break; case TYPE_DEVICE: - if (!IS_DEVICE(stp->st_mode)) + if (!IS_DEVICE(sxp->st.st_mode)) continue; break; #ifdef SUPPORT_LINKS case TYPE_SYMLINK: - if (!S_ISLNK(stp->st_mode)) + if (!S_ISLNK(sxp->st.st_mode)) continue; break; #endif @@ -893,7 +997,8 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, break; case TYPE_SPECIAL: case TYPE_DEVICE: - if (stp->st_rdev != MAKEDEV(F_DMAJOR(file), F_DMINOR(file))) + devp = F_RDEV_P(file); + if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp))) continue; break; #ifdef SUPPORT_LINKS @@ -910,7 +1015,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, match_level = 2; best_match = j; } - if (unchanged_attrs(file, stp)) { + if (unchanged_attrs(cmpbuf, file, sxp)) { match_level = 3; best_match = j; break; @@ -923,7 +1028,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, if (j != best_match) { j = best_match; pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); - if (link_stat(cmpbuf, stp, 0) < 0) + if (link_stat(cmpbuf, &sxp->st, 0) < 0) return -1; } @@ -943,8 +1048,8 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, cmpbuf, fname); return j; } - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, -1); + if (preserve_hard_links && F_IS_HLINKED(file)) + finish_hard_link(file, fname, NULL, itemizing, code, -1); } else #endif match_level = 2; @@ -954,7 +1059,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, : ITEM_LOCAL_CHANGE + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0); char *lp = match_level == 3 ? "" : NULL; - itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp); + itemize(cmpbuf, file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp); } if (verbose > 1 && maybe_ATTRS_REPORT) { rprintf(FCLIENT, "%s%s is uptodate\n", @@ -967,20 +1072,20 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, } static int phase = 0; +static int dflt_perms; -/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir, +/* Acts on the indicated item in cur_flist whose name is fname. If a dir, * make sure it exists, and has the right permissions/timestamp info. For * all other non-regular files (symlinks, etc.) we create them here. For * regular files that have changed, we try to find a basis file and then - * start sending checksums. + * start sending checksums. The ndx is the file's unique index value. * * When fname is non-null, it must point to a MAXPATHLEN buffer! * * Note that f_out is set to -1 when doing final directory-permission and * modification-time repair. */ static void recv_generator(char *fname, struct file_struct *file, int ndx, - int itemizing, int maybe_ATTRS_REPORT, - enum logcode code, int f_out) + int itemizing, enum logcode code, int f_out) { static int missing_below = -1, excluded_below = -1; static const char *parent_dirname = ""; @@ -988,7 +1093,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, static int need_fuzzy_dirlist = 0; struct file_struct *fuzzy_file = NULL; int fd = -1, f_copy = -1; - STRUCT_STAT st, real_st, partial_st; + statx sx, real_sx; + STRUCT_STAT partial_st; struct file_struct *back_file = NULL; int statret, real_ret, stat_errno; char *fnamecmp, *partialptr, *backupptr = NULL; @@ -999,33 +1105,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (list_only) return; - if (!fname) { - if (fuzzy_dirlist) { - flist_free(fuzzy_dirlist); - fuzzy_dirlist = NULL; - } - if (missing_below >= 0) { - if (dry_run) - dry_run--; - missing_below = -1; - } - parent_dirname = ""; - return; - } - if (verbose > 2) rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx); if (server_filter_list.head) { if (excluded_below >= 0) { - if (file->dir.depth > excluded_below) + if (F_DEPTH(file) > excluded_below) goto skipping; excluded_below = -1; } if (check_filter(&server_filter_list, fname, S_ISDIR(file->mode)) < 0) { if (S_ISDIR(file->mode)) - excluded_below = file->dir.depth; + excluded_below = F_DEPTH(file); skipping: if (verbose) { rprintf(FINFO, @@ -1037,21 +1129,35 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (missing_below >= 0) { - if (file->dir.depth <= missing_below) { + if (F_DEPTH(file) <= missing_below) { if (dry_run) dry_run--; missing_below = -1; - } else if (!dry_run) + } else if (!dry_run) { + if (S_ISDIR(file->mode)) + file->flags |= FLAG_MISSING_DIR; return; + } } +#ifdef SUPPORT_ACLS + sx.acc_acl = sx.def_acl = NULL; +#endif +#ifdef SUPPORT_XATTRS + sx.xattr = NULL; +#endif if (dry_run > 1) { + if (fuzzy_dirlist) { + flist_free(fuzzy_dirlist); + fuzzy_dirlist = NULL; + } + parent_dirname = ""; statret = -1; stat_errno = ENOENT; } else { const char *dn = file->dirname ? file->dirname : "."; if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) { if (relative_paths && !implied_dirs - && do_stat(dn, &st) < 0 + && do_stat(dn, &sx.st) < 0 && create_directory_path(fname) < 0) { rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", @@ -1063,6 +1169,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (fuzzy_basis) need_fuzzy_dirlist = 1; +#ifdef SUPPORT_ACLS + if (!preserve_perms) + dflt_perms = default_perms_for_dir(dn); +#endif } parent_dirname = dn; @@ -1072,53 +1182,57 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, need_fuzzy_dirlist = 0; } - statret = link_stat(fname, &st, + statret = link_stat(fname, &sx.st, keep_dirlinks && S_ISDIR(file->mode)); stat_errno = errno; } - if (ignore_non_existing && statret == -1 && stat_errno == ENOENT) { + if (ignore_non_existing > 0 && statret == -1 && stat_errno == ENOENT) { if (verbose > 1) { rprintf(FINFO, "not creating new %s \"%s\"\n", S_ISDIR(file->mode) ? "directory" : "file", fname); } + if (S_ISDIR(file->mode)) { + if (missing_below < 0) { + if (dry_run) + dry_run++; + missing_below = F_DEPTH(file); + } + file->flags |= FLAG_MISSING_DIR; + } return; } - /* If we're not preserving permissions, change the file-list's - * mode based on the local permissions and some heuristics. */ - if (!preserve_perms) { - int exists = statret == 0 - && S_ISDIR(st.st_mode) == S_ISDIR(file->mode); - file->mode = dest_mode(file->mode, st.st_mode, exists); - } - if (S_ISDIR(file->mode)) { /* 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 * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ - if (statret == 0 && !S_ISDIR(st.st_mode)) { - if (delete_item(fname, st.st_mode, "directory", del_opts) != 0) + if (statret == 0 && !S_ISDIR(sx.st.st_mode)) { + if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0) return; statret = -1; } if (dry_run && statret != 0 && missing_below < 0) { - missing_below = file->dir.depth; + missing_below = F_DEPTH(file); dry_run++; } real_ret = statret; - real_st = st; + real_sx = sx; if (new_root_dir) { if (*fname == '.' && fname[1] == '\0') statret = -1; new_root_dir = 0; } + if (!preserve_perms) { /* See comment in non-dir code below. */ + file->mode = dest_mode(file->mode, sx.st.st_mode, + dflt_perms, statret == 0); + } if (statret != 0 && basis_dir[0] != NULL) { - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, - itemizing, maybe_ATTRS_REPORT, code); + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, + itemizing, code); if (j == -2) { itemizing = 0; code = FNONE; @@ -1126,7 +1240,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = 1; } if (itemizing && f_out != -1) { - itemize(file, ndx, statret, &st, + itemize(fname, file, ndx, statret, &sx, statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); } if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { @@ -1136,38 +1250,51 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rsyserr(FERROR, errno, "recv_generator: mkdir %s failed", full_fname(fname)); + rprintf(FERROR, + "*** Skipping any contents from this failed directory ***\n"); + missing_below = F_DEPTH(file); file->flags |= FLAG_MISSING_DIR; - if (ndx+1 < the_file_list->count - && the_file_list->files[ndx+1]->dir.depth > file->dir.depth) { - rprintf(FERROR, - "*** Skipping everything below this failed directory ***\n"); - missing_below = file->dir.depth; - } - return; + goto cleanup; } } - if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0) + if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0) && verbose && code != FNONE && f_out != -1) rprintf(code, "%s/\n", fname); if (real_ret != 0 && one_file_system) - real_st.st_dev = filesystem_dev; - if (delete_during && f_out != -1 && !phase && dry_run < 2 + real_sx.st.st_dev = filesystem_dev; + if (inc_recurse) { + if (one_file_system) { + uint32 *devp = F_DIRDEV_P(file); + DEV_MAJOR(devp) = major(real_sx.st.st_dev); + DEV_MINOR(devp) = minor(real_sx.st.st_dev); + } + } + else if (delete_during && f_out != -1 && !phase && dry_run < 2 && (file->flags & FLAG_XFER_DIR)) - delete_in_dir(the_file_list, fname, file, &real_st); - return; + delete_in_dir(cur_flist, fname, file, &real_sx.st.st_dev); + goto cleanup; } - if (preserve_hard_links && IS_HLINKED(file) - && hard_link_check(file, ndx, fname, statret, &st, - itemizing, code, HL_CHECK_MASTER)) - return; + /* If we're not preserving permissions, change the file-list's + * mode based on the local permissions and some heuristics. */ + if (!preserve_perms) { + int exists = statret == 0 && !S_ISDIR(sx.st.st_mode); + file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, + exists); + } + +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_HLINK_NOT_FIRST(file) + && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code)) + goto cleanup; +#endif if (preserve_links && S_ISLNK(file->mode)) { #ifdef SUPPORT_LINKS const char *sl = F_SYMLINK(file); if (safe_symlinks && unsafe_symlink(sl, fname)) { if (verbose) { - if (the_file_list->count == 1) + if (solo_file) fname = f_name(file, NULL); rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n", @@ -1179,27 +1306,29 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, char lnk[MAXPATHLEN]; int len; - if (!S_ISLNK(st.st_mode)) + if (!S_ISLNK(sx.st.st_mode)) statret = -1; else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0 && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') { /* The link is pointing to the right place. */ + set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT); if (itemizing) - itemize(file, ndx, 0, &st, 0, 0, NULL); - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, -1); + 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); +#endif if (remove_source_files == 1) goto return_with_success; - return; + goto cleanup; } /* Not the right symlink (or not a symlink), so * delete it. */ - if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0) - return; + if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0) + goto cleanup; } else if (basis_dir[0] != NULL) { - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, - itemizing, maybe_ATTRS_REPORT, code); + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, + itemizing, code); if (j == -2) { #ifndef CAN_HARDLINK_SYMLINK if (link_dest) { @@ -1207,29 +1336,31 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else #endif if (!copy_dest) - return; + goto cleanup; itemizing = 0; code = FNONE; } else if (j >= 0) statret = 1; } - if (preserve_hard_links && IS_HLINKED(file) - && hard_link_check(file, ndx, fname, -1, &st, - itemizing, code, HL_SKIP)) - return; +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + goto cleanup; +#endif if (do_symlink(sl, fname) != 0) { rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed", full_fname(fname), sl); } else { - set_file_attrs(fname, file, NULL, 0); + set_file_attrs(fname, file, NULL, NULL, 0); if (itemizing) { - itemize(file, ndx, statret, &st, + itemize(fname, file, ndx, statret, &sx, ITEM_LOCAL_CHANGE, 0, NULL); } if (code != FNONE && verbose) rprintf(code, "%s -> %s\n", fname, sl); - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, -1); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_IS_HLINKED(file)) + finish_hard_link(file, fname, NULL, itemizing, code, -1); +#endif /* This does not check remove_source_files == 1 * because this is one of the items that the old * --remove-sent-files option would remove. */ @@ -1237,41 +1368,44 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto return_with_success; } #endif - return; + goto cleanup; } if ((am_root && preserve_devices && IS_DEVICE(file->mode)) || (preserve_specials && IS_SPECIAL(file->mode))) { - dev_t rdev = MAKEDEV(F_DMAJOR(file), F_DMINOR(file)); + uint32 *devp = F_RDEV_P(file); + dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); if (statret == 0) { char *t; if (IS_DEVICE(file->mode)) { - if (!IS_DEVICE(st.st_mode)) + if (!IS_DEVICE(sx.st.st_mode)) statret = -1; t = "device file"; } else { - if (!IS_SPECIAL(st.st_mode)) + if (!IS_SPECIAL(sx.st.st_mode)) statret = -1; t = "special file"; } if (statret == 0 - && (st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS) - && st.st_rdev == rdev) { + && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT) + && sx.st.st_rdev == rdev) { /* The device or special file is identical. */ + set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT); if (itemizing) - itemize(file, ndx, 0, &st, 0, 0, NULL); - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, -1); + 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); +#endif if (remove_source_files == 1) goto return_with_success; - return; + goto cleanup; } - if (delete_item(fname, st.st_mode, t, del_opts) != 0) - return; + if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0) + goto cleanup; } else if (basis_dir[0] != NULL) { - int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, - itemizing, maybe_ATTRS_REPORT, code); + int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, + itemizing, code); if (j == -2) { #ifndef CAN_HARDLINK_SPECIAL if (link_dest) { @@ -1279,93 +1413,96 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else #endif if (!copy_dest) - return; + goto cleanup; itemizing = 0; code = FNONE; } else if (j >= 0) statret = 1; } - if (preserve_hard_links && IS_HLINKED(file) - && hard_link_check(file, ndx, fname, -1, &st, - itemizing, code, HL_SKIP)) - return; +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + goto cleanup; +#endif if (verbose > 2) { - rprintf(FINFO,"mknod(%s,0%o,0x%x)\n", - fname, (int)file->mode, (int)rdev); + rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n", + fname, (int)file->mode, + (long)major(rdev), (long)minor(rdev)); } if (do_mknod(fname, file->mode, rdev) < 0) { rsyserr(FERROR, errno, "mknod %s failed", full_fname(fname)); } else { - set_file_attrs(fname, file, NULL, 0); + set_file_attrs(fname, file, NULL, NULL, 0); if (itemizing) { - itemize(file, ndx, statret, &st, + itemize(fname, file, ndx, statret, &sx, ITEM_LOCAL_CHANGE, 0, NULL); } if (code != FNONE && verbose) rprintf(code, "%s\n", fname); - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, -1); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_IS_HLINKED(file)) + finish_hard_link(file, fname, NULL, itemizing, code, -1); +#endif if (remove_source_files == 1) goto return_with_success; } - return; + goto cleanup; } if (!S_ISREG(file->mode)) { - if (the_file_list->count == 1) + if (solo_file) fname = f_name(file, NULL); rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname); - return; + goto cleanup; } - if (max_size && file->length > max_size) { + if (max_size > 0 && F_LENGTH(file) > max_size) { if (verbose > 1) { - if (the_file_list->count == 1) + if (solo_file) fname = f_name(file, NULL); rprintf(FINFO, "%s is over max-size\n", fname); } - return; + goto cleanup; } - if (min_size && file->length < min_size) { + if (min_size > 0 && F_LENGTH(file) < min_size) { if (verbose > 1) { - if (the_file_list->count == 1) + if (solo_file) fname = f_name(file, NULL); rprintf(FINFO, "%s is under min-size\n", fname); } - return; + goto cleanup; } - if (ignore_existing && statret == 0) { + if (ignore_existing > 0 && statret == 0) { if (verbose > 1) rprintf(FINFO, "%s exists\n", fname); - return; + goto cleanup; } - if (update_only && statret == 0 - && cmp_time(st.st_mtime, file->modtime) > 0) { + if (update_only > 0 && statret == 0 + && cmp_time(sx.st.st_mtime, file->modtime) > 0) { if (verbose > 1) rprintf(FINFO, "%s is newer\n", fname); - return; + goto cleanup; } fnamecmp = fname; fnamecmp_type = FNAMECMP_FNAME; - if (statret == 0 && !S_ISREG(st.st_mode)) { - if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0) - return; + if (statret == 0 && !S_ISREG(sx.st.st_mode)) { + if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0) + goto cleanup; statret = -1; stat_errno = ENOENT; } if (statret != 0 && basis_dir[0] != NULL) { - int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st, - itemizing, maybe_ATTRS_REPORT, code); + int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx, + itemizing, code); if (j == -2) { if (remove_source_files == 1) goto return_with_success; - return; + goto cleanup; } if (j >= 0) { fnamecmp = fnamecmpbuf; @@ -1375,7 +1512,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } real_ret = statret; - real_st = st; + real_sx = sx; if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL && link_stat(partialptr, &partial_st, 0) == 0 @@ -1394,7 +1531,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(FINFO, "fuzzy basis selected for %s: %s\n", fname, fnamecmpbuf); } - st.st_size = fuzzy_file->length; + sx.st.st_size = F_LENGTH(fuzzy_file); statret = 0; fnamecmp = fnamecmpbuf; fnamecmp_type = FNAMECMP_FUZZY; @@ -1402,50 +1539,47 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0) { - if (preserve_hard_links && IS_HLINKED(file) - && hard_link_check(file, ndx, fname, statret, &st, - itemizing, code, HL_SKIP)) - return; +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + goto cleanup; +#endif if (stat_errno == ENOENT) goto notify_others; rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", full_fname(fname)); - return; + goto cleanup; } - if (append_mode && st.st_size > file->length) - return; + if (append_mode > 0 && sx.st.st_size > F_LENGTH(file)) + goto cleanup; if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (fnamecmp_type == FNAMECMP_FUZZY) ; - else if (unchanged_file(fnamecmp, file, &st)) { + else if (unchanged_file(fnamecmp, file, &sx.st)) { if (partialptr) { do_unlink(partialptr); handle_partial_dir(partialptr, PDIR_DELETE); } - if (itemizing) { - itemize(file, ndx, real_ret, &real_st, - 0, 0, NULL); - } - set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT); - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, -1); + set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT); + if (itemizing) + 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); +#endif if (remove_source_files != 1) - return; + goto cleanup; return_with_success: - if (!dry_run) { - char numbuf[4]; - SIVAL(numbuf, 0, ndx); - send_msg(MSG_SUCCESS, numbuf, 4); - } - return; + if (!dry_run) + send_msg_int(MSG_SUCCESS, ndx); + goto cleanup; } prepare_to_open: if (partialptr) { - st = partial_st; + sx.st = partial_st; fnamecmp = partialptr; fnamecmp_type = FNAMECMP_PARTIAL_DIR; statret = 0; @@ -1457,7 +1591,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (fuzzy_dirlist) { int j = flist_find(fuzzy_dirlist, file); if (j >= 0) /* don't use changing file as future fuzzy basis */ - fuzzy_dirlist->files[j]->flags |= FLAG_SENT; + fuzzy_dirlist->files[j]->flags |= FLAG_FILE_SENT; } /* open the file */ @@ -1468,18 +1602,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, full_fname(fnamecmp)); pretend_missing: /* pretend the file didn't exist */ - if (preserve_hard_links && IS_HLINKED(file) - && hard_link_check(file, ndx, fname, statret, &st, - itemizing, code, HL_SKIP)) - return; +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_HLINK_NOT_LAST(file)) + goto cleanup; +#endif statret = real_ret = -1; goto notify_others; } - if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) { + if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) { if (!(backupptr = get_backup_name(fname))) { close(fd); - return; + goto cleanup; } if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) { close(fd); @@ -1490,7 +1624,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, full_fname(backupptr)); unmake_file(back_file); close(fd); - return; + goto cleanup; } if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { @@ -1498,14 +1632,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, full_fname(backupptr)); unmake_file(back_file); close(fd); - return; + goto cleanup; } fnamecmp_type = FNAMECMP_BACKUP; } if (verbose > 3) { rprintf(FINFO, "gen mapped %s of size %.0f\n", - fnamecmp, (double)st.st_size); + fnamecmp, (double)sx.st.st_size); } if (verbose > 2) @@ -1514,37 +1648,53 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, notify_others: if (remove_source_files && !delay_updates && !phase) increment_active_files(ndx, itemizing, code); - write_int(f_out, ndx); + if (inc_recurse && !dry_run) + cur_flist->in_progress++; +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_IS_HLINKED(file)) + file->flags |= FLAG_FILE_SENT; +#endif + write_ndx(f_out, ndx); if (itemizing) { int iflags = ITEM_TRANSFER; - if (always_checksum) + if (always_checksum > 0) iflags |= ITEM_REPORT_CHECKSUM; if (fnamecmp_type != FNAMECMP_FNAME) iflags |= ITEM_BASIS_TYPE_FOLLOWS; if (fnamecmp_type == FNAMECMP_FUZZY) iflags |= ITEM_XNAME_FOLLOWS; - itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type, + itemize(fnamecmp, file, -1, real_ret, &real_sx, iflags, fnamecmp_type, fuzzy_file ? fuzzy_file->basename : NULL); +#ifdef SUPPORT_ACLS + if (preserve_acls) + free_acl(&real_sx); +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + free_xattr(&real_sx); +#endif } if (!do_xfers) { - if (preserve_hard_links && IS_HLINKED(file)) - hard_link_cluster(file, ndx, itemizing, code, -1); - return; +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && F_IS_HLINKED(file)) + finish_hard_link(file, fname, &sx.st, itemizing, code, -1); +#endif + goto cleanup; } if (read_batch) - return; + goto cleanup; if (statret != 0 || whole_file) { write_sum_head(f_out, NULL); - return; + goto cleanup; } - generate_and_send_sums(fd, st.st_size, f_out, f_copy); + generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy); if (f_copy >= 0) { close(f_copy); - set_file_attrs(backupptr, back_file, NULL, 0); + set_file_attrs(backupptr, back_file, NULL, NULL, 0); if (verbose > 1) { rprintf(FINFO, "backed up %s to %s\n", fname, backupptr); @@ -1553,22 +1703,136 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } close(fd); + + cleanup: +#ifdef SUPPORT_ACLS + if (preserve_acls) + free_acl(&sx); +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + free_xattr(&sx); +#endif + return; +} + +static void touch_up_dirs(struct file_list *flist, int ndx) +{ + struct file_struct *file; + char *fname; + int i, j, start, end; + + if (ndx < 0) { + start = 0; + end = flist->count - 1; + } else + start = end = ndx; + + /* Fix any directory permissions that were modified during the + * transfer and/or re-set any tweaked modified-time values. */ + for (i = start, j = 0; i <= end; i++) { + file = flist->files[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) + continue; + fname = f_name(file, NULL); + if (!(file->mode & S_IWUSR)) + do_chmod(fname, file->mode); + if (need_retouch_dir_times) + set_modtime(fname, file->modtime, file->mode); + if (allowed_lull && !(++j % lull_mod)) + maybe_send_keepalive(); + else if (!(j % 200)) + maybe_flush_socket(0); + } +} + +void check_for_finished_files(int itemizing, enum logcode code, int check_redo) +{ + struct file_struct *file; + struct file_list *flist; + char fbuf[MAXPATHLEN]; + int ndx; + +#ifdef SUPPORT_HARD_LINKS + while (preserve_hard_links && (ndx = get_hlink_num()) != -1) { + flist = flist_for_ndx(ndx); + assert(flist != NULL); + file = flist->files[ndx]; + assert(file->flags & FLAG_HLINKED); + finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1); + } +#endif + + while (check_redo && (ndx = get_redo_num()) != -1) { + csum_length = SUM_LENGTH; + max_size = -max_size; + min_size = -min_size; + ignore_existing = -ignore_existing; + ignore_non_existing = -ignore_non_existing; + update_only = -update_only; + always_checksum = -always_checksum; + size_only = -size_only; + append_mode = -append_mode; + make_backups = -make_backups; /* avoid dup backup w/inplace */ + ignore_times++; + + flist = cur_flist; + cur_flist = flist_for_ndx(ndx); + + file = cur_flist->files[ndx - cur_flist->ndx_start]; + if (solo_file) + strlcpy(fbuf, solo_file, sizeof fbuf); + else + f_name(file, fbuf); + recv_generator(fbuf, file, ndx, itemizing, code, sock_f_out); + cur_flist->to_redo--; + + cur_flist = flist; + + csum_length = SHORT_SUM_LENGTH; + max_size = -max_size; + min_size = -min_size; + ignore_existing = -ignore_existing; + ignore_non_existing = -ignore_non_existing; + update_only = -update_only; + always_checksum = -always_checksum; + size_only = -size_only; + append_mode = -append_mode; + make_backups = -make_backups; + ignore_times--; + } + + while (cur_flist != first_flist) { /* only possible with inc_recurse */ + if (first_flist->in_progress || first_flist->to_redo) + break; + + if (!read_batch) { + write_ndx(sock_f_out, NDX_DONE); + 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 */ + } } -void generate_files(int f_out, struct file_list *flist, char *local_name) +void generate_files(int f_out, const char *local_name) { int i; char fbuf[MAXPATHLEN]; - int itemizing, maybe_ATTRS_REPORT; + int itemizing; enum logcode code; - int lull_mod = allowed_lull * 5; - int need_retouch_dir_times = preserve_times && !omit_dir_times; int need_retouch_dir_perms = 0; - int save_ignore_existing = ignore_existing; - int save_ignore_non_existing = ignore_non_existing; int save_do_progress = do_progress; - int save_make_backups = make_backups; - int dir_tweaking = !(list_only || local_name || dry_run); if (protocol_version >= 29) { itemizing = 1; @@ -1587,19 +1851,25 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) maybe_ATTRS_REPORT = ATTRS_REPORT; code = FINFO; } + solo_file = local_name; + dir_tweaking = !(list_only || solo_file || dry_run); + need_retouch_dir_times = preserve_times && !omit_dir_times; + lull_mod = allowed_lull * 5; - if (verbose > 2) { - rprintf(FINFO, "generator starting pid=%ld count=%d\n", - (long)getpid(), flist->count); - } + if (verbose > 2) + rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid()); - if (delete_before && !local_name && flist->count > 0) - do_delete_pass(flist); - if (delete_during == 2) - start_delete_temp(); + if (delete_before && !solo_file && cur_flist->count > 0) + do_delete_pass(cur_flist); + if (delete_during == 2) { + deldelay_size = BIGPATHBUFLEN * 4; + deldelay_buf = new_array(char, deldelay_size); + if (!deldelay_buf) + out_of_memory("delete-delay"); + } do_progress = 0; - if (append_mode || whole_file < 0) + if (append_mode > 0 || whole_file < 0) whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", @@ -1614,137 +1884,123 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) * notice that and let us know via the redo pipe (or its closing). */ ignore_timeout = 1; - for (i = 0; i < flist->count; i++) { - struct file_struct *file = flist->files[i]; + dflt_perms = (ACCESSPERMS & ~orig_umask); - if (!file->basename) - continue; + do { + if (inc_recurse && delete_during && 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(cur_flist, f_name(fp, fbuf), fp, &dirdev); + } + } + for (i = cur_flist->low; i <= cur_flist->high; i++) { + struct file_struct *file = cur_flist->files[i]; - if (local_name) - strlcpy(fbuf, local_name, sizeof fbuf); - else - f_name(file, fbuf); - recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT, - code, f_out); + if (!F_IS_ACTIVE(file)) + continue; - /* 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. */ + if (solo_file) + strlcpy(fbuf, solo_file, sizeof fbuf); + else + f_name(file, fbuf); + recv_generator(fbuf, file, i + cur_flist->ndx_start, + 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; /* user write */ - char *fname = local_name ? local_name : fbuf; - if (do_chmod(fname, mode) < 0) { - rsyserr(FERROR, errno, - "failed to modify permissions on %s", - full_fname(fname)); + 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; } - need_retouch_dir_perms = 1; - } #endif - if (preserve_hard_links) - check_for_finished_hlinks(itemizing, code); + check_for_finished_files(itemizing, code, 0); - if (allowed_lull && !(i % lull_mod)) - maybe_send_keepalive(); - else if (!(i % 200)) - maybe_flush_socket(); - } - recv_generator(NULL, NULL, 0, 0, 0, code, -1); - if (delete_during) - delete_in_dir(NULL, NULL, NULL, NULL); + if (allowed_lull && !(i % lull_mod)) + maybe_send_keepalive(); + else if (!(i % 200)) + maybe_flush_socket(0); + } - phase++; - csum_length = SUM_LENGTH; - max_size = min_size = ignore_existing = ignore_non_existing = 0; - update_only = always_checksum = size_only = 0; - ignore_times = 1; - if (append_mode) /* resend w/o append mode */ - append_mode = -1; /* ... but only longer files */ - make_backups = 0; /* avoid a duplicate backup for inplace processing */ + if (!inc_recurse) { + write_ndx(f_out, NDX_DONE); + break; + } - if (verbose > 2) - rprintf(FINFO,"generate_files phase=%d\n",phase); + while (1) { + check_for_finished_files(itemizing, code, 1); + if (cur_flist->next || flist_eof) + break; + wait_for_receiver(); + } + } while ((cur_flist = cur_flist->next) != NULL); - write_int(f_out, NDX_DONE); + if (delete_during) + delete_in_dir(NULL, NULL, NULL, &dev_zero); + phase++; + if (verbose > 2) + rprintf(FINFO, "generate_files phase=%d\n", phase); - /* files can cycle through the system more than once - * to catch initial checksum errors */ - while ((i = get_redo_num(itemizing, code)) != -1) { - struct file_struct *file = flist->files[i]; - if (local_name) - strlcpy(fbuf, local_name, sizeof fbuf); - else - f_name(file, fbuf); - recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT, - code, f_out); + while (1) { + check_for_finished_files(itemizing, code, 1); + if (msgdone_cnt) + break; + wait_for_receiver(); } phase++; - ignore_non_existing = save_ignore_non_existing; - ignore_existing = save_ignore_existing; - make_backups = save_make_backups; - if (verbose > 2) - rprintf(FINFO,"generate_files phase=%d\n",phase); + rprintf(FINFO, "generate_files phase=%d\n", phase); - write_int(f_out, NDX_DONE); + write_ndx(f_out, NDX_DONE); /* Reduce round-trip lag-time for a useless delay-updates phase. */ if (protocol_version >= 29 && !delay_updates) - write_int(f_out, NDX_DONE); + write_ndx(f_out, NDX_DONE); /* Read MSG_DONE for the redo phase (and any prior messages). */ - get_redo_num(itemizing, code); + while (1) { + check_for_finished_files(itemizing, code, 0); + if (msgdone_cnt > 1) + break; + wait_for_receiver(); + } if (protocol_version >= 29) { phase++; if (verbose > 2) rprintf(FINFO, "generate_files phase=%d\n", phase); if (delay_updates) - write_int(f_out, NDX_DONE); + write_ndx(f_out, NDX_DONE); /* Read MSG_DONE for delay-updates phase & prior messages. */ - get_redo_num(itemizing, code); + while (msgdone_cnt == 2) + wait_for_receiver(); } do_progress = save_do_progress; - if (delete_delay_fp) - delayed_deletions(fbuf); - if (delete_after && !local_name && flist->count > 0) - do_delete_pass(flist); - - if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) { - int j = 0; - /* Now we need to fix any directory permissions that were - * modified during the transfer and/or re-set any tweaked - * modified-time values. */ - for (i = 0; i < flist->count; i++) { - struct file_struct *file = flist->files[i]; - - if (!file->basename || !S_ISDIR(file->mode)) - continue; - if (!need_retouch_dir_times && file->mode & S_IWUSR) - continue; - if (file->flags & FLAG_MISSING_DIR) { - int missing = file->dir.depth; - while (++i < flist->count) { - file = flist->files[i]; - if (file->dir.depth <= missing) - break; - } - i--; - continue; - } - recv_generator(f_name(file, NULL), file, i, itemizing, - maybe_ATTRS_REPORT, code, -1); - if (allowed_lull && !(++j % lull_mod)) - maybe_send_keepalive(); - else if (!(j % 200)) - maybe_flush_socket(); - } - } - recv_generator(NULL, NULL, 0, 0, 0, code, -1); + if (delete_during == 2) + do_delayed_deletions(fbuf); + if (delete_after && !solo_file && file_total > 0) + do_delete_pass(cur_flist); + + if ((need_retouch_dir_perms || need_retouch_dir_times) + && dir_tweaking && (!inc_recurse || delete_during == 2)) + touch_up_dirs(inc_recurse ? dir_flist : cur_flist, -1); if (max_delete >= 0 && deletion_count > max_delete) { rprintf(FINFO, @@ -1754,5 +2010,5 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) } if (verbose > 2) - rprintf(FINFO,"generate_files finished\n"); + rprintf(FINFO, "generate_files finished\n"); }