X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/38a4bd432afdb39cca6cccaa671413ffd4d161aa..e9489cd6cb380b30727bd3d074eacc59abca080e:/generator.c diff --git a/generator.c b/generator.c index 1d637976..27e5b97d 100644 --- a/generator.c +++ b/generator.c @@ -4,7 +4,7 @@ * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2002 Martin Pool - * Copyright (C) 2003-2007 Wayne Davison + * Copyright (C) 2003-2008 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 @@ -41,6 +41,7 @@ extern int preserve_links; extern int preserve_devices; extern int preserve_specials; extern int preserve_hard_links; +extern int preserve_executability; extern int preserve_perms; extern int preserve_times; extern int uid_ndx; @@ -96,7 +97,7 @@ extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; extern struct file_list *cur_flist, *first_flist, *dir_flist; -extern struct filter_list_struct server_filter_list; +extern struct filter_list_struct daemon_filter_list; int ignore_perishable = 0; int non_perishable_cnt = 0; @@ -109,12 +110,13 @@ static char *deldelay_buf = NULL; static int deldelay_fd = -1; static int lull_mod; static int dir_tweaking; +static int symlink_timeset_failed_flags; 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(). */ -#define DEL_OWNED_BY_US (1<<0) /* file/dir has our uid */ +#define DEL_NO_UID_WRITE (1<<0) /* file/dir has our uid w/o write perm */ #define DEL_RECURSE (1<<1) /* if dir, delete all contents */ #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ #define DEL_FOR_FILE (1<<3) /* making room for a replacement file */ @@ -133,8 +135,12 @@ enum delret { DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY }; -/* Forward declaration for delete_item(). */ -static enum delret delete_dir_contents(char *fname, int flags); +/* Forward declarations. */ +static enum delret delete_dir_contents(char *fname, uint16 flags); +#ifdef SUPPORT_HARD_LINKS +static void handle_skipped_hlink(struct file_struct *file, int itemizing, + enum logcode code, int f_out); +#endif static int is_backup_file(char *fn) { @@ -148,7 +154,7 @@ static int is_backup_file(char *fn) * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's * a directory! (The buffer is used for recursion, but returned unchanged.) */ -static enum delret delete_item(char *fbuf, int mode, int flags) +static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) { enum delret ret; char *what; @@ -156,17 +162,26 @@ static enum delret delete_item(char *fbuf, int mode, int flags) if (verbose > 2) { rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n", - fbuf, mode, flags); + fbuf, (int)mode, (int)flags); } - if (!am_root && !(mode & S_IWUSR) && flags & DEL_OWNED_BY_US) - do_chmod(fbuf, mode |= S_IWUSR); + if (flags & DEL_NO_UID_WRITE) + do_chmod(fbuf, mode | S_IWUSR); if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { + int save_uid_ndx = uid_ndx; + /* This only happens on the first call to delete_item() since + * delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */ + if (!uid_ndx) + uid_ndx = ++file_extra_cnt; ignore_perishable = 1; /* If DEL_RECURSE is not set, this just reports emptiness. */ ret = delete_dir_contents(fbuf, flags); ignore_perishable = 0; + if (!save_uid_ndx) { + --file_extra_cnt; + uid_ndx = 0; + } if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT) goto check_ret; /* OK: try to delete the directory. */ @@ -227,7 +242,7 @@ static enum delret delete_item(char *fbuf, int mode, int flags) * DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The * buffer is used for recursion, but returned unchanged.) */ -static enum delret delete_dir_contents(char *fname, int flags) +static enum delret delete_dir_contents(char *fname, uint16 flags) { struct file_list *dirlist; enum delret ret; @@ -262,12 +277,13 @@ static enum delret delete_dir_contents(char *fname, int flags) remainder = MAXPATHLEN - (p - fname); /* We do our own recursion, so make delete_item() non-recursive. */ - flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM)) | DEL_DIR_IS_EMPTY; + flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM|DEL_NO_UID_WRITE)) + | DEL_DIR_IS_EMPTY; for (j = dirlist->used; j--; ) { struct file_struct *fp = dirlist->files[j]; - if (fp->flags & FLAG_MOUNT_DIR) { + if (fp->flags & FLAG_MOUNT_DIR && S_ISDIR(fp->mode)) { if (verbose > 1) { rprintf(FINFO, "mount point, %s, pins parent directory\n", @@ -278,14 +294,10 @@ static enum delret delete_dir_contents(char *fname, int flags) } strlcpy(p, fp->basename, remainder); - if (F_OWNER(fp) == our_uid) - flags |= DEL_OWNED_BY_US; - else - flags &= ~DEL_OWNED_BY_US; + if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) + do_chmod(fname, fp->mode | S_IWUSR); /* Save stack by recursing to ourself directly. */ if (S_ISDIR(fp->mode)) { - if (!am_root && !(fp->mode & S_IWUSR) && flags & DEL_OWNED_BY_US) - do_chmod(fname, fp->mode |= S_IWUSR); if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) ret = DR_NOT_EMPTY; } @@ -328,10 +340,12 @@ static int start_delete_delay_temp(void) static int flush_delete_delay(void) { + if (deldelay_fd < 0 && !start_delete_delay_temp()) + return 0; if (write(deldelay_fd, deldelay_buf, deldelay_cnt) != deldelay_cnt) { rsyserr(FERROR, errno, "flush of delete-delay buffer"); delete_during = 0; - delete_after = 1; + delete_after = !inc_recurse; close(deldelay_fd); return 0; } @@ -341,19 +355,21 @@ static int flush_delete_delay(void) static int remember_delete(struct file_struct *file, const char *fname, int flags) { - const char *plus = (!am_root && !(file->mode & S_IWUSR) && flags & DEL_OWNED_BY_US) - ? "+" : ""; int len; + if (deldelay_cnt == deldelay_size && !flush_delete_delay()) + return 0; + + if (flags & DEL_NO_UID_WRITE) + deldelay_buf[deldelay_cnt++] = '!'; + while (1) { len = snprintf(deldelay_buf + deldelay_cnt, deldelay_size - deldelay_cnt, - "%s%x %s%c", - plus, (int)file->mode, fname, '\0'); + "%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; @@ -362,7 +378,7 @@ static int remember_delete(struct file_struct *file, const char *fname, int flag return 1; } -static int read_delay_line(char *buf, int *own_flag_p) +static int read_delay_line(char *buf, int *flags_p) { static int read_pos = 0; int j, len, mode; @@ -403,11 +419,11 @@ static int read_delay_line(char *buf, int *own_flag_p) } bp = deldelay_buf + read_pos; - if (*bp == '+') { + if (*bp == '!') { bp++; - *own_flag_p = DEL_OWNED_BY_US; + *flags_p = DEL_NO_UID_WRITE; } else - *own_flag_p = 0; + *flags_p = 0; if (sscanf(bp, "%x ", &mode) != 1) { invalid_data: @@ -432,15 +448,15 @@ static int read_delay_line(char *buf, int *own_flag_p) static void do_delayed_deletions(char *delbuf) { - int mode, own_flag; + int mode, flags; if (deldelay_fd >= 0) { if (deldelay_cnt && !flush_delete_delay()) return; lseek(deldelay_fd, 0, 0); } - while ((mode = read_delay_line(delbuf, &own_flag)) >= 0) - delete_item(delbuf, mode, own_flag | DEL_RECURSE); + while ((mode = read_delay_line(delbuf, &flags)) >= 0) + delete_item(delbuf, mode, flags | DEL_RECURSE); if (deldelay_fd >= 0) close(deldelay_fd); } @@ -456,6 +472,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) struct file_list *dirlist; char delbuf[MAXPATHLEN]; int dlen, i; + int save_uid_ndx = uid_ndx; if (!fbuf) { change_local_filter_dir(NULL, 0, 0); @@ -487,6 +504,9 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) return; } + if (!uid_ndx) + uid_ndx = ++file_extra_cnt; + dirlist = get_dirlist(fbuf, dlen, 0); /* If an item in dirlist is not found in flist, delete it @@ -495,15 +515,16 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) struct file_struct *fp = dirlist->files[i]; if (!F_IS_ACTIVE(fp)) continue; - if (fp->flags & FLAG_MOUNT_DIR) { + if (fp->flags & FLAG_MOUNT_DIR && S_ISDIR(fp->mode)) { if (verbose > 1) rprintf(FINFO, "cannot delete mount point: %s\n", f_name(fp, NULL)); continue; } if (flist_find(cur_flist, fp) < 0) { - int flags = DEL_RECURSE - | (F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0); + int flags = DEL_RECURSE; + if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) + flags |= DEL_NO_UID_WRITE; f_name(fp, delbuf); if (delete_during == 2) { if (!remember_delete(fp, delbuf, flags)) @@ -514,6 +535,11 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) } flist_free(dirlist); + + if (!save_uid_ndx) { + --file_extra_cnt; + uid_ndx = 0; + } } /* This deletes any files on the receiving side that are not present on the @@ -531,10 +557,13 @@ static void do_delete_pass(void) for (j = 0; j < cur_flist->used; j++) { struct file_struct *file = cur_flist->sorted[j]; - if (!(file->flags & FLAG_CONTENT_DIR)) + f_name(file, fbuf); + + if (!(file->flags & FLAG_CONTENT_DIR)) { + change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(file)); continue; + } - f_name(file, fbuf); if (verbose > 1 && file->flags & FLAG_TOP_DIR) rprintf(FINFO, "deleting in %s\n", fbuf); @@ -552,7 +581,7 @@ static void do_delete_pass(void) int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) { -#ifndef HAVE_LUTIMES +#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES if (S_ISLNK(file->mode)) { ; } else @@ -560,7 +589,11 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) if (preserve_times && cmp_time(sxp->st.st_mtime, file->modtime) != 0) return 0; - if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) + if (preserve_perms) { + if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) + return 0; + } else if (preserve_executability + && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0))) return 0; if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)) @@ -595,22 +628,33 @@ 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) ? preserve_times > 1 - : !S_ISLNK(file->mode); + : S_ISDIR(file->mode) ? preserve_times > 1 : +#if defined HAVE_LUTIMES && defined HAVE_UTIMES + 1; +#else + !S_ISLNK(file->mode); +#endif 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) + if (file->flags & FLAG_TIME_FAILED) { /* symlinks only */ + if (iflags & ITEM_LOCAL_CHANGE) + iflags |= symlink_timeset_failed_flags; + } else if (keep_time + ? cmp_time(file->modtime, sxp->st.st_mtime) != 0 + : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED) && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0)) iflags |= ITEM_REPORT_TIME; #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST if (S_ISLNK(file->mode)) { ; } else #endif - if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) + if (preserve_perms) { + if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) + iflags |= ITEM_REPORT_PERMS; + } else if (preserve_executability + && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0))) iflags |= ITEM_REPORT_PERMS; if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) iflags |= ITEM_REPORT_OWNER; @@ -960,7 +1004,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, goto try_a_copy; if (preserve_hard_links && F_IS_HLINKED(file)) finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j); - if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { + if (!maybe_ATTRS_REPORT && (verbose > 1 || stdout_format_has_i > 1)) { itemize(cmpbuf, file, ndx, 1, sxp, ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0, ""); @@ -1126,8 +1170,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, if (itemizing && stdout_format_has_i && (verbose > 1 || stdout_format_has_i > 1)) { int chg = compare_dest && type != TYPE_DIR ? 0 - : ITEM_LOCAL_CHANGE - + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0); + : ITEM_LOCAL_CHANGE + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0); char *lp = match_level == 3 ? "" : NULL; itemize(cmpbuf, file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp); } @@ -1173,22 +1216,34 @@ static void list_file_entry(struct file_struct *f) static int phase = 0; static int dflt_perms; +static int implied_dirs_are_missing; +/* Helper for recv_generator's skip_dir and dry_missing_dir tests. */ +static BOOL is_below(struct file_struct *file, struct file_struct *subtree) +{ + return F_DEPTH(file) > F_DEPTH(subtree) + && (!implied_dirs_are_missing || f_name_has_prefix(file, subtree)); +} + /* 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. The ndx is the file's unique index value. * - * When fname is non-null, it must point to a MAXPATHLEN buffer! + * The fname parameter must point to a MAXPATHLEN buffer! (e.g it gets + * passed to delete_item(), which can use it during a recursive delete.) * * 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, enum logcode code, int f_out) { - static int missing_below = -1, excluded_below = -1; static const char *parent_dirname = ""; - static struct file_struct *missing_dir = NULL, *excluded_dir = NULL; + /* Missing dir not created due to --dry-run; will still be scanned. */ + static struct file_struct *dry_missing_dir = NULL; + /* Missing dir whose contents are skipped altogether due to + * --ignore-non-existing, daemon exclude, or mkdir failure. */ + static struct file_struct *skip_dir = NULL; static struct file_list *fuzzy_dirlist = NULL; static int need_fuzzy_dirlist = 0; struct file_struct *fuzzy_file = NULL; @@ -1200,63 +1255,60 @@ 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 && protocol_version < 30; int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0; + int is_dir = !S_ISDIR(file->mode) ? 0 + : inc_recurse && ndx != cur_flist->ndx_start - 1 ? -1 + : 1; if (verbose > 2) rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx); if (list_only) { - if (S_ISDIR(file->mode) - && ((!implied_dirs && file->flags & FLAG_IMPLIED_DIR) - || (inc_recurse && ndx != cur_flist->ndx_start - 1))) + if (is_dir < 0 + || (is_dir && !implied_dirs && file->flags & FLAG_IMPLIED_DIR)) return; list_file_entry(file); return; } - if (server_filter_list.head) { - if (excluded_below >= 0) { - 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)) { - excluded_below = F_DEPTH(file); - excluded_dir = file; - } - skipping: - if (verbose) { - rprintf(FINFO, - "skipping server-excluded file \"%s\"\n", - fname); - } + if (skip_dir) { + if (is_below(file, skip_dir)) { + if (is_dir) + file->flags |= FLAG_MISSING_DIR; +#ifdef SUPPORT_HARD_LINKS + else if (F_IS_HLINKED(file)) + handle_skipped_hlink(file, itemizing, code, f_out); +#endif return; } + skip_dir = NULL; } - if (missing_below >= 0) { - 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; - } else if (!dry_run) { - if (S_ISDIR(file->mode)) - file->flags |= FLAG_MISSING_DIR; + if (daemon_filter_list.head && (*fname != '.' || fname[1])) { + if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) { + if (is_dir < 0) + return; +#ifdef SUPPORT_HARD_LINKS + if (F_IS_HLINKED(file)) + handle_skipped_hlink(file, itemizing, code, f_out); +#endif + rprintf(FERROR_XFER, + "skipping daemon-excluded %s \"%s\"\n", + is_dir ? "directory" : "file", fname); + if (is_dir) + goto skipping_dir_contents; return; } } + #ifdef SUPPORT_ACLS sx.acc_acl = sx.def_acl = NULL; #endif #ifdef SUPPORT_XATTRS sx.xattr = NULL; #endif - if (dry_run > 1) { + if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) { + parent_is_dry_missing: if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); fuzzy_dirlist = NULL; @@ -1266,13 +1318,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, stat_errno = ENOENT; } else { const char *dn = file->dirname ? file->dirname : "."; + dry_missing_dir = NULL; if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) { if (relative_paths && !implied_dirs - && do_stat(dn, &sx.st) < 0 - && create_directory_path(fname) < 0) { - rsyserr(FERROR_XFER, errno, - "recv_generator: mkdir %s failed", - full_fname(dn)); + && do_stat(dn, &sx.st) < 0) { + if (dry_run) + goto parent_is_dry_missing; + if (create_directory_path(fname) < 0) { + rsyserr(FERROR_XFER, errno, + "recv_generator: mkdir %s failed", + full_fname(dn)); + } } if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); @@ -1293,36 +1349,47 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, need_fuzzy_dirlist = 0; } - statret = link_stat(fname, &sx.st, - keep_dirlinks && S_ISDIR(file->mode)); + statret = link_stat(fname, &sx.st, keep_dirlinks && is_dir); stat_errno = errno; } if (ignore_non_existing > 0 && statret == -1 && stat_errno == ENOENT) { + if (is_dir) { + if (is_dir < 0) + return; + skip_dir = file; + file->flags |= FLAG_MISSING_DIR; + } +#ifdef SUPPORT_HARD_LINKS + else if (F_IS_HLINKED(file)) + handle_skipped_hlink(file, itemizing, code, f_out); +#endif 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); - missing_dir = file; - } - file->flags |= FLAG_MISSING_DIR; + is_dir ? "directory" : "file", fname); } return; } - if (statret == 0 && sx.st.st_uid == our_uid) - del_opts |= DEL_OWNED_BY_US; + if (statret == 0 && !(sx.st.st_mode & S_IWUSR) + && !am_root && sx.st.st_uid == our_uid) + del_opts |= DEL_NO_UID_WRITE; - if (S_ISDIR(file->mode)) { + if (ignore_existing > 0 && statret == 0 + && (!is_dir || !S_ISDIR(sx.st.st_mode))) { + if (verbose > 1 && is_dir >= 0) + rprintf(FINFO, "%s exists\n", fname); +#ifdef SUPPORT_HARD_LINKS + if (F_IS_HLINKED(file)) + handle_skipped_hlink(file, itemizing, code, f_out); +#endif + goto cleanup; + } + + if (is_dir) { if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR) goto cleanup; - if (inc_recurse && ndx != cur_flist->ndx_start - 1) { + if (is_dir < 0) { /* In inc_recurse mode we want to make sure any missing * directories get created while we're still processing * the parent dir (which allows us to touch the parent @@ -1346,10 +1413,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto skipping_dir_contents; statret = -1; } - if (dry_run && statret != 0 && missing_below < 0) { - missing_below = F_DEPTH(file); - missing_dir = file; - dry_run++; + if (dry_run && statret != 0) { + if (!dry_missing_dir) + dry_missing_dir = file; + file->flags |= FLAG_MISSING_DIR; } real_ret = statret; real_sx = sx; @@ -1382,8 +1449,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, skipping_dir_contents: rprintf(FERROR, "*** Skipping any contents from this failed directory ***\n"); - missing_below = F_DEPTH(file); - missing_dir = file; + skip_dir = file; file->flags |= FLAG_MISSING_DIR; goto cleanup; } @@ -1416,9 +1482,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, DEV_MINOR(devp) = minor(real_sx.st.st_dev); } } - else if (delete_during && f_out != -1 && !phase && dry_run < 2 - && (file->flags & FLAG_CONTENT_DIR)) - delete_in_dir(fname, file, &real_sx.st.st_dev); + else if (delete_during && f_out != -1 && !phase + && !(file->flags & FLAG_MISSING_DIR)) { + if (file->flags & FLAG_CONTENT_DIR) + delete_in_dir(fname, file, &real_sx.st.st_dev); + else + change_local_filter_dir(fname, strlen(fname), F_DEPTH(file)); + } goto cleanup; } @@ -1502,7 +1572,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, set_file_attrs(fname, file, NULL, NULL, 0); if (itemizing) { itemize(fname, file, ndx, statret, &sx, - ITEM_LOCAL_CHANGE, 0, NULL); + ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL); } if (code != FNONE && verbose) rprintf(code, "%s -> %s\n", fname, sl); @@ -1586,7 +1656,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, set_file_attrs(fname, file, NULL, NULL, 0); if (itemizing) { itemize(fname, file, ndx, statret, &sx, - ITEM_LOCAL_CHANGE, 0, NULL); + ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL); } if (code != FNONE && verbose) rprintf(code, "%s\n", fname); @@ -1624,16 +1694,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto cleanup; } - if (ignore_existing > 0 && statret == 0) { - if (verbose > 1) - rprintf(FINFO, "%s exists\n", fname); - goto cleanup; - } - 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); +#ifdef SUPPORT_HARD_LINKS + if (F_IS_HLINKED(file)) + handle_skipped_hlink(file, itemizing, code, f_out); +#endif goto cleanup; } @@ -1673,7 +1741,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } else partialptr = NULL; - if (statret != 0 && fuzzy_dirlist && dry_run <= 1) { + if (statret != 0 && fuzzy_dirlist) { int j = find_fuzzy(file, fuzzy_dirlist); if (j >= 0) { fuzzy_file = fuzzy_dirlist->files[j]; @@ -1703,9 +1771,6 @@ 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)) - goto cleanup; - if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (fnamecmp_type == FNAMECMP_FUZZY) @@ -1730,6 +1795,14 @@ 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)) { +#ifdef SUPPORT_HARD_LINKS + if (F_IS_HLINKED(file)) + handle_skipped_hlink(file, itemizing, code, f_out); +#endif + goto cleanup; + } + prepare_to_open: if (partialptr) { sx.st = partial_st; @@ -1795,15 +1868,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, close(fd); goto cleanup; } - if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0 - && (errno != ENOENT || make_bak_dir(backupptr) < 0 - || (f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0)) { - rsyserr(FERROR_XFER, errno, "open %s", - full_fname(backupptr)); - unmake_file(back_file); - back_file = NULL; - close(fd); - goto cleanup; + if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) { + int save_errno = errno ? errno : EINVAL; /* 0 paranoia */ + if (errno == ENOENT && make_bak_dir(backupptr) == 0) { + if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) + save_errno = errno ? errno : save_errno; + else + save_errno = 0; + } + if (save_errno) { + rsyserr(FERROR_XFER, save_errno, "open %s", full_fname(backupptr)); + unmake_file(back_file); + back_file = NULL; + close(fd); + goto cleanup; + } } fnamecmp_type = FNAMECMP_BACKUP; } @@ -1817,7 +1896,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, rprintf(FINFO, "generating and sending sums for %d\n", ndx); notify_others: - if (remove_source_files && !delay_updates && !phase) + if (remove_source_files && !delay_updates && !phase && !dry_run) increment_active_files(ndx, itemizing, code); if (inc_recurse && !dry_run) cur_flist->in_progress++; @@ -1829,7 +1908,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (itemizing) { int iflags = ITEM_TRANSFER; if (always_checksum > 0) - iflags |= ITEM_REPORT_CHECKSUM; + iflags |= ITEM_REPORT_CHANGE; if (fnamecmp_type != FNAMECMP_FNAME) iflags |= ITEM_BASIS_TYPE_FOLLOWS; if (fnamecmp_type == FNAMECMP_FUZZY) @@ -1865,9 +1944,16 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, cleanup: if (back_file) { + int save_preserve_xattrs = preserve_xattrs; if (f_copy >= 0) close(f_copy); +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + copy_xattrs(fname, backupptr); +#endif + preserve_xattrs = 0; set_file_attrs(backupptr, back_file, NULL, NULL, 0); + preserve_xattrs = save_preserve_xattrs; if (verbose > 1) { rprintf(FINFO, "backed up %s to %s\n", fname, backupptr); @@ -1886,6 +1972,28 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } +#ifdef SUPPORT_HARD_LINKS +static void handle_skipped_hlink(struct file_struct *file, int itemizing, + enum logcode code, int f_out) +{ + char fbuf[MAXPATHLEN]; + int new_last_ndx; + struct file_list *save_flist = cur_flist; + + /* If we skip the last item in a chain of links and there was a + * prior non-skipped hard-link waiting to finish, finish it now. */ + if ((new_last_ndx = skip_hard_link(file, &cur_flist)) < 0) + return; + + file = cur_flist->files[new_last_ndx - cur_flist->ndx_start]; + cur_flist->in_progress--; /* undo prior increment */ + f_name(file, fbuf); + recv_generator(fbuf, file, new_last_ndx, itemizing, code, f_out); + + cur_flist = save_flist; +} +#endif + static void touch_up_dirs(struct file_list *flist, int ndx) { static int counter = 0; @@ -1917,8 +2025,12 @@ static void touch_up_dirs(struct file_list *flist, int ndx) 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 (need_retouch_dir_times) { + STRUCT_STAT st; + if (link_stat(fname, &st, 0) == 0 + && cmp_time(st.st_mtime, file->modtime) != 0) + set_modtime(fname, file->modtime, file->mode); + } if (allowed_lull && !(counter % lull_mod)) maybe_send_keepalive(); else if (!(counter & 0xFF)) @@ -2036,6 +2148,9 @@ void generate_files(int f_out, const char *local_name) dir_tweaking = !(list_only || solo_file || dry_run); need_retouch_dir_times = preserve_times > 1; lull_mod = allowed_lull * 5; + symlink_timeset_failed_flags = ITEM_REPORT_TIME + | (protocol_version >= 30 || !am_server ? ITEM_REPORT_TIMEFAIL : 0); + implied_dirs_are_missing = relative_paths && !implied_dirs && protocol_version < 30; if (verbose > 2) rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid()); @@ -2080,16 +2195,18 @@ void generate_files(int f_out, const char *local_name) 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 && !list_only) { - if (BITS_SETnUNSET(fp->flags, FLAG_CONTENT_DIR, FLAG_MISSING_DIR)) { + if (delete_during && dry_run < 2 && !list_only + && !(fp->flags & FLAG_MISSING_DIR)) { + if (fp->flags & FLAG_CONTENT_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); - } + delete_in_dir(fbuf, fp, &dirdev); + } else + change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp)); } } for (i = cur_flist->low; i <= cur_flist->high; i++) {