X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b769ad6a3e7ef871ea0aabd5b033018ba6cdbb90..236adddc18cd4f0e3d91183220af10c11c5cc8a2:/generator.c diff --git a/generator.c b/generator.c index a0bf08ee..f4f15bb8 100644 --- a/generator.c +++ b/generator.c @@ -27,6 +27,7 @@ extern int dry_run; extern int do_xfers; extern int stdout_format_has_i; extern int logfile_format_has_i; +extern int receiver_symlink_times; extern int am_root; extern int am_server; extern int am_daemon; @@ -41,6 +42,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; @@ -91,6 +93,7 @@ extern int one_file_system; extern struct stats stats; extern dev_t filesystem_dev; extern mode_t orig_umask; +extern uid_t our_uid; extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; @@ -113,8 +116,16 @@ static int need_retouch_dir_perms; static const char *solo_file = NULL; /* For calling delete_item() and delete_dir_contents(). */ -#define DEL_RECURSE (1<<1) /* recurse */ +#define DEL_OWNED_BY_US (1<<0) /* file/dir has our uid */ +#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 */ +#define DEL_FOR_DIR (1<<4) /* making room for a replacement dir */ +#define DEL_FOR_SYMLINK (1<<5) /* making room for a replacement symlink */ +#define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */ +#define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */ + +#define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL) enum nonregtype { TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK @@ -127,7 +138,6 @@ enum delret { /* Forward declaration for delete_item(). */ static enum delret delete_dir_contents(char *fname, int flags); - static int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; @@ -140,7 +150,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, char *replace, int flags) +static enum delret delete_item(char *fbuf, int mode, int flags) { enum delret ret; char *what; @@ -151,6 +161,9 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) fbuf, mode, flags); } + if (!am_root && !(mode & S_IWUSR) && flags & DEL_OWNED_BY_US) + do_chmod(fbuf, mode |= S_IWUSR); + if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { ignore_perishable = 1; /* If DEL_RECURSE is not set, this just reports emptiness. */ @@ -161,7 +174,7 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) /* OK: try to delete the directory. */ } - if (!replace && max_delete >= 0 && ++deletion_count > max_delete) + if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && ++deletion_count > max_delete) return DR_AT_LIMIT; if (S_ISDIR(mode)) { @@ -176,7 +189,7 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) } if (ok) { - if (!replace) + if (!(flags & DEL_MAKE_ROOM)) log_delete(fbuf, mode); ret = DR_SUCCESS; } else { @@ -195,9 +208,18 @@ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) } check_ret: - if (replace && ret != DR_SUCCESS) { + if (ret != DR_SUCCESS && flags & DEL_MAKE_ROOM) { + const char *desc; + switch (flags & DEL_MAKE_ROOM) { + case DEL_FOR_FILE: desc = "regular file"; break; + case DEL_FOR_DIR: desc = "directory"; break; + case DEL_FOR_SYMLINK: desc = "symlink"; break; + case DEL_FOR_DEVICE: desc = "device file"; break; + case DEL_FOR_SPECIAL: desc = "special file"; break; + default: exit_cleanup(RERR_UNSUPPORTED); /* IMPOSSIBLE */ + } rprintf(FERROR_XFER, "could not make way for new %s: %s\n", - replace, fbuf); + desc, fbuf); } return ret; } @@ -242,7 +264,7 @@ 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_DIR_IS_EMPTY; + flags = (flags & ~(DEL_RECURSE|DEL_MAKE_ROOM)) | DEL_DIR_IS_EMPTY; for (j = dirlist->used; j--; ) { struct file_struct *fp = dirlist->files[j]; @@ -258,11 +280,18 @@ static enum delret delete_dir_contents(char *fname, int flags) } strlcpy(p, fp->basename, remainder); + if (!uid_ndx || (uid_t)F_OWNER(fp) == our_uid) + flags |= DEL_OWNED_BY_US; + else + flags &= ~DEL_OWNED_BY_US; /* Save stack by recursing to ourself directly. */ - if (S_ISDIR(fp->mode) - && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS) - ret = DR_NOT_EMPTY; - if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) + 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; + } + if (delete_item(fname, fp->mode, flags) != DR_SUCCESS) ret = DR_NOT_EMPTY; } @@ -312,14 +341,17 @@ static int flush_delete_delay(void) return 1; } -static int remember_delete(struct file_struct *file, const char *fname) +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; while (1) { len = snprintf(deldelay_buf + deldelay_cnt, deldelay_size - deldelay_cnt, - "%x %s%c", (int)file->mode, fname, '\0'); + "%s%x %s%c", + plus, (int)file->mode, fname, '\0'); if ((deldelay_cnt += len) <= deldelay_size) break; if (deldelay_fd < 0 && !start_delete_delay_temp()) @@ -332,7 +364,7 @@ static int remember_delete(struct file_struct *file, const char *fname) return 1; } -static int read_delay_line(char *buf) +static int read_delay_line(char *buf, int *own_flag_p) { static int read_pos = 0; int j, len, mode; @@ -373,6 +405,11 @@ static int read_delay_line(char *buf) } bp = deldelay_buf + read_pos; + if (*bp == '+') { + bp++; + *own_flag_p = DEL_OWNED_BY_US; + } else + *own_flag_p = 0; if (sscanf(bp, "%x ", &mode) != 1) { invalid_data: @@ -397,15 +434,15 @@ static int read_delay_line(char *buf) static void do_delayed_deletions(char *delbuf) { - int mode; + int mode, own_flag; 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); + while ((mode = read_delay_line(delbuf, &own_flag)) >= 0) + delete_item(delbuf, mode, own_flag | DEL_RECURSE); if (deldelay_fd >= 0) close(deldelay_fd); } @@ -467,12 +504,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) continue; } if (flist_find(cur_flist, fp) < 0) { + int flags = DEL_RECURSE + | (!uid_ndx || (uid_t)F_OWNER(fp) == our_uid ? DEL_OWNED_BY_US : 0); f_name(fp, delbuf); if (delete_during == 2) { - if (!remember_delete(fp, delbuf)) + if (!remember_delete(fp, delbuf, flags)) break; } else - delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); + delete_item(delbuf, fp->mode, flags); } } @@ -515,7 +554,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 @@ -526,6 +565,9 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) return 0; + 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)) return 0; @@ -558,8 +600,11 @@ 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 + (receiver_symlink_times && !(file->flags & FLAG_TIME_FAILED)) || +#endif + !S_ISLNK(file->mode); if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) iflags |= ITEM_REPORT_SIZE; @@ -573,7 +618,8 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre ; } else #endif - if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) + if ((preserve_perms || preserve_executability) + && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) iflags |= ITEM_REPORT_OWNER; @@ -923,7 +969,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, ""); @@ -1165,38 +1211,40 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, 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) { + int filtered = check_filter(&server_filter_list, fname, is_dir) < 0; + if (is_dir < 0 && filtered) + return; 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)) { + if (filtered) { + if (is_dir) { excluded_below = F_DEPTH(file); excluded_dir = file; } skipping: - if (verbose) { - rprintf(FINFO, - "skipping server-excluded file \"%s\"\n", - fname); - } + rprintf(FERROR_XFER, + "skipping daemon-excluded file \"%s\"\n", + fname); return; } } @@ -1208,7 +1256,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, dry_run--; missing_below = -1; } else if (!dry_run) { - if (S_ISDIR(file->mode)) + if (is_dir) file->flags |= FLAG_MISSING_DIR; return; } @@ -1256,18 +1304,14 @@ 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 (verbose > 1) { - rprintf(FINFO, "not creating new %s \"%s\"\n", - S_ISDIR(file->mode) ? "directory" : "file", - fname); - } - if (S_ISDIR(file->mode)) { + if (is_dir) { + if (is_dir < 0) + return; if (missing_below < 0) { if (dry_run) dry_run++; @@ -1276,13 +1320,20 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } file->flags |= FLAG_MISSING_DIR; } + if (verbose > 1) { + rprintf(FINFO, "not creating new %s \"%s\"\n", + is_dir ? "directory" : "file", fname); + } return; } - if (S_ISDIR(file->mode)) { + if (statret == 0 && sx.st.st_uid == our_uid) + del_opts |= DEL_OWNED_BY_US; + + 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 @@ -1290,7 +1341,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * 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)) + || delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0)) goto cleanup; /* Any errors get reported later. */ if (do_mkdir(fname, file->mode & 0700) == 0) file->flags |= FLAG_DIR_CREATED; @@ -1302,7 +1353,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, * we need to delete it. If it doesn't exist, then * (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) + if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0) goto skipping_dir_contents; statret = -1; } @@ -1431,7 +1482,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } /* Not the right symlink (or not a symlink), so * delete it. */ - if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0) + if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_SYMLINK) != 0) goto cleanup; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, @@ -1485,15 +1536,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, uint32 *devp = F_RDEV_P(file); dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); if (statret == 0) { - char *t; + int del_for_flag; if (IS_DEVICE(file->mode)) { if (!IS_DEVICE(sx.st.st_mode)) statret = -1; - t = "device file"; + del_for_flag = DEL_FOR_DEVICE; } else { if (!IS_SPECIAL(sx.st.st_mode)) statret = -1; - t = "special file"; + del_for_flag = DEL_FOR_SPECIAL; } if (statret == 0 && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT) @@ -1510,7 +1561,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto return_with_success; goto cleanup; } - if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0) + if (delete_item(fname, sx.st.st_mode, del_opts | del_for_flag) != 0) goto cleanup; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, @@ -1601,7 +1652,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(sx.st.st_mode)) { - if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0) + if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_FILE) != 0) goto cleanup; statret = -1; stat_errno = ENOENT;