X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ee1c00fea8647356e403368fad9ad4c909e9ef08..ddc5ae3d9e6cc632b93bac327b6f92d0545b0537:/generator.c diff --git a/generator.c b/generator.c index acf4b888..d5dc85f5 100644 --- a/generator.c +++ b/generator.c @@ -44,8 +44,6 @@ extern int preserve_hard_links; extern int preserve_executability; extern int preserve_perms; extern int preserve_times; -extern int uid_ndx; -extern int gid_ndx; extern int delete_mode; extern int delete_before; extern int delete_during; @@ -71,7 +69,6 @@ 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; @@ -91,7 +88,6 @@ extern int max_delete; extern int force_delete; extern int one_file_system; extern int skipped_deletes; -extern struct stats stats; extern dev_t filesystem_dev; extern mode_t orig_umask; extern uid_t our_uid; @@ -280,7 +276,6 @@ 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); @@ -291,9 +286,9 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); if (allowed_lull) - maybe_send_keepalive(); + maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH); - if (io_error && !ignore_errors) { + if (io_error & IOERR_GENERAL && !ignore_errors) { if (already_warned) return; rprintf(FINFO, @@ -312,9 +307,6 @@ 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 @@ -334,7 +326,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev) * a delete_item call with a DEL_MAKE_ROOM flag. */ if (flist_find_ignore_dirness(cur_flist, fp) < 0) { int flags = DEL_RECURSE; - if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid) + if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US) flags |= DEL_NO_UID_WRITE; f_name(fp, delbuf); if (delete_during == 2) { @@ -346,11 +338,6 @@ 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 @@ -390,47 +377,111 @@ static void do_delete_pass(void) rprintf(FINFO, " \r"); } -int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) +static BOOL preserve_time_of(struct file_struct *file) { -#ifndef CAN_SET_SYMLINK_TIMES - if (S_ISLNK(file->mode)) { - ; - } else -#endif - if (preserve_times && cmp_time(sxp->st.st_mtime, file->modtime) != 0) - return 0; + if (S_ISDIR(file->mode)) + return preserve_times & PRESERVE_DIR_TIMES; + else if (S_ISLNK(file->mode)) + /* PRESERVE_LINK_TIMES will only be set if CAN_SET_SYMLINK_TIMES. */ + return preserve_times & PRESERVE_LINK_TIMES; + else + return preserve_times; +} - 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))) +static BOOL report_time(struct file_struct *file, stat_x *sxp) +{ + return preserve_time_of(file) && + cmp_time(sxp->st.st_mtime, file->modtime); +} + +static BOOL report_perms(struct file_struct *file, stat_x *sxp) +{ +#ifndef CAN_CHMOD_SYMLINK + if (S_ISLNK(file->mode)) return 0; +#endif + + if (preserve_perms) + return !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS); - if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file)) + if (preserve_executability) + return (sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0); + + return 0; +} + +static BOOL report_owner(struct file_struct *file, stat_x *sxp) +{ +#ifndef CAN_CHOWN_SYMLINK + if (S_ISLNK(file->mode)) return 0; +#endif - if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file)) + return uid_ndx && am_root && sxp->st.st_uid != (uid_t)F_OWNER(file); +} + +static BOOL report_group(struct file_struct *file, stat_x *sxp) +{ +#ifndef CAN_CHOWN_SYMLINK + if (S_ISLNK(file->mode)) return 0; +#endif + + return gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file); +} #ifdef SUPPORT_ACLS - if (preserve_acls && !S_ISLNK(file->mode)) { +static BOOL report_acls(const char *fname, struct file_struct *file, stat_x *sxp) +{ +#ifndef CAN_SET_SYMLINK_ACLS /* not currently */ + if (S_ISLNK(file->mode)) + return 0; +#endif + + if (preserve_acls) { if (!ACL_READY(*sxp)) get_acl(fname, sxp); if (set_acl(NULL, file, sxp, file->mode)) - return 0; + return 1; } + + return 0; +} #endif + #ifdef SUPPORT_XATTRS +static BOOL report_xattrs(const char *fname, struct file_struct *file, stat_x *sxp, + BOOL mark_needed) +{ +#ifdef NO_SYMLINK_XATTRS + if (S_ISLNK(file->mode)) + return 0; +#endif + if (preserve_xattrs) { if (!XATTR_READY(*sxp)) get_xattr(fname, sxp); - if (xattr_diff(file, sxp, 0)) - return 0; + if (xattr_diff(file, sxp, mark_needed)) + return 1; } + + return 0; +} #endif - return 1; +int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) +{ + return !(report_time(file, sxp) + || report_perms(file, sxp) + || report_owner(file, sxp) + || report_group(file, sxp) +#ifdef SUPPORT_ACLS + || report_acls(fname, file, sxp) +#endif +#ifdef SUPPORT_XATTRS + || report_xattrs(fname, file, sxp, False) +#endif + ); } void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statret, @@ -438,59 +489,33 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre const char *xname) { if (statret >= 0) { /* A from-dest-dir statret can == 1! */ - int keep_time = !preserve_times ? 0 - : S_ISDIR(file->mode) ? preserve_times > 1 : -#ifdef CAN_SET_SYMLINK_TIMES - 1; -#else - !S_ISLNK(file->mode); -#endif - if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) iflags |= ITEM_REPORT_SIZE; if (file->flags & FLAG_TIME_FAILED) { /* symlinks only */ if (iflags & ITEM_LOCAL_CHANGE) iflags |= symlink_timeset_failed_flags; - } else if (keep_time + } else if (preserve_time_of(file) ? cmp_time(file->modtime, sxp->st.st_mtime) != 0 : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED) && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) iflags |= ITEM_REPORT_TIME; -#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST - if (S_ISLNK(file->mode)) { - ; - } else -#endif - 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))) + if (report_perms(file, sxp)) iflags |= ITEM_REPORT_PERMS; - if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) + if (report_owner(file, sxp)) iflags |= ITEM_REPORT_OWNER; - if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) - && sxp->st.st_gid != (gid_t)F_GROUP(file)) + if (report_group(file, sxp)) iflags |= ITEM_REPORT_GROUP; #ifdef SUPPORT_ACLS - if (preserve_acls && !S_ISLNK(file->mode)) { - if (!ACL_READY(*sxp)) - get_acl(fnamecmp, sxp); - if (set_acl(NULL, file, sxp, file->mode)) - iflags |= ITEM_REPORT_ACL; - } + if (report_acls(fnamecmp, file, sxp)) + 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; - } + if (report_xattrs(fnamecmp, file, sxp, True)) + iflags |= ITEM_REPORT_XATTR; #endif } else { #ifdef SUPPORT_XATTRS - if (preserve_xattrs && xattr_diff(file, NULL, 1)) + if (preserve_xattrs && xattr_diff(file, NULL, True)) iflags |= ITEM_REPORT_XATTR; #endif iflags |= ITEM_IS_NEW; @@ -510,13 +535,15 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre #ifdef SUPPORT_XATTRS if (preserve_xattrs && do_xfers && iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) { - send_xattr_request(NULL, file, - iflags & ITEM_REPORT_XATTR ? sock_f_out : -1); + int fd = iflags & ITEM_REPORT_XATTR + && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)) + ? sock_f_out : -1; + send_xattr_request(NULL, file, fd); } #endif } else if (ndx >= 0) { enum logcode code = logfile_format_has_i ? FINFO : FCLIENT; - log_item(code, file, &stats, iflags, xname); + log_item(code, file, iflags, xname); } } } @@ -569,6 +596,12 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len) int s2length; int64 l; + if (len < 0) { + /* The file length overflowed our int64 var, so we can't process this file. */ + sum->count = -1; /* indicate overflow error */ + return; + } + if (block_size) blength = block_size; else if (len <= BLOCK_SIZE * BLOCK_SIZE) @@ -1034,7 +1067,7 @@ static void list_file_entry(struct file_struct *f) #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { rprintf(FINFO, "%s %*s %s %s -> %s\n", - permbuf, colwidth, comma_num(len), + permbuf, colwidth, human_num(len), timestring(f->modtime), f_name(f, NULL), F_SYMLINK(f)); } else @@ -1045,7 +1078,7 @@ static void list_file_entry(struct file_struct *f) f_name(f, NULL)); } else { rprintf(FINFO, "%s %*s %s %s\n", - permbuf, colwidth, comma_num(len), + permbuf, colwidth, human_num(len), timestring(f->modtime), f_name(f, NULL)); } } @@ -1121,6 +1154,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, skip_dir = NULL; } + init_stat_x(&sx); if (daemon_filter_list.head && (*fname != '.' || fname[1])) { if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) { if (is_dir < 0) @@ -1130,7 +1164,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, handle_skipped_hlink(file, itemizing, code, f_out); #endif rprintf(FERROR_XFER, - "skipping daemon-excluded %s \"%s\"\n", + "ERROR: daemon refused to receive %s \"%s\"\n", is_dir ? "directory" : "file", fname); if (is_dir) goto skipping_dir_contents; @@ -1138,7 +1172,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } } - init_stat_x(&sx); if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) { parent_is_dry_missing: if (fuzzy_dirlist) { @@ -1177,7 +1210,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (need_fuzzy_dirlist && S_ISREG(file->mode)) { strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf); - fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1); + fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, GDL_IGNORE_FILTER_RULES); need_fuzzy_dirlist = 0; } @@ -1226,9 +1259,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto cleanup; } + fnamecmp = fname; + if (is_dir) { + mode_t added_perms; if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR) goto cleanup; + if (am_root < 0) { + /* For --fake-super, the dir must be useable by the copying + * user, just like it would be for root. */ + added_perms = S_IRUSR|S_IWUSR|S_IXUSR; + } else + added_perms = 0; if (is_dir < 0) { /* In inc_recurse mode we want to make sure any missing * directories get created while we're still processing @@ -1239,7 +1281,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, && (S_ISDIR(sx.st.st_mode) || 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) + if (do_mkdir(fname, (file->mode|added_perms) & 0700) == 0) file->flags |= FLAG_DIR_CREATED; goto cleanup; } @@ -1273,17 +1315,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemizing = 0; code = FNONE; statret = 1; - } else if (j >= 0) + } else if (j >= 0) { statret = 1; + fnamecmp = fnamecmpbuf; + } } if (itemizing && f_out != -1) { - itemize(fname, file, ndx, statret, &sx, + itemize(fnamecmp, file, ndx, statret, &sx, statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL); } - if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) { + if (real_ret != 0 && do_mkdir(fname,file->mode|added_perms) < 0 && errno != EEXIST) { if (!relative_paths || errno != ENOENT || make_path(fname, MKP_DROP_NAME | MKP_SKIP_SLASH) < 0 - || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) { + || (do_mkdir(fname, file->mode|added_perms) < 0 && errno != EEXIST)) { rsyserr(FERROR_XFER, errno, "recv_generator: mkdir %s failed", full_fname(fname)); @@ -1295,6 +1339,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto cleanup; } } + #ifdef SUPPORT_XATTRS if (preserve_xattrs && statret == 1) copy_xattrs(fnamecmpbuf, fname); @@ -1356,11 +1401,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, const char *sl = F_SYMLINK(file); if (safe_symlinks && unsafe_symlink(sl, fname)) { if (INFO_GTE(NAME, 1)) { - if (solo_file) + if (solo_file) { + /* fname contains the destination path, but we + * want to report the source path. */ fname = f_name(file, NULL); + } rprintf(FINFO, - "ignoring unsafe symlink %s -> \"%s\"\n", - full_fname(fname), sl); + "ignoring unsafe symlink \"%s\" -> \"%s\"\n", + fname, sl); } return; } @@ -1531,7 +1579,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto cleanup; } - fnamecmp = fname; fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(sx.st.st_mode)) { @@ -1893,6 +1940,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx) static int counter = 0; struct file_struct *file; char *fname; + BOOL fix_dir_perms; int i, start, end; if (ndx < 0) { @@ -1913,11 +1961,13 @@ static void touch_up_dirs(struct file_list *flist, int ndx) rprintf(FINFO, "touch_up_dirs: %s (%d)\n", NS(fname), i); } + /* Be sure not to retouch permissions with --fake-super. */ + fix_dir_perms = !am_root && !(file->mode & S_IWUSR); if (!F_IS_ACTIVE(file) || file->flags & FLAG_MISSING_DIR - || (!need_retouch_dir_times && file->mode & S_IWUSR)) + || !(need_retouch_dir_times || fix_dir_perms)) continue; fname = f_name(file, NULL); - if (!(file->mode & S_IWUSR)) + if (fix_dir_perms) do_chmod(fname, file->mode); if (need_retouch_dir_times) { STRUCT_STAT st; @@ -1927,7 +1977,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx) } if (counter >= loopchk_limit) { if (allowed_lull) - maybe_send_keepalive(); + maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH); else maybe_flush_socket(0); counter = 0; @@ -2046,7 +2096,7 @@ void generate_files(int f_out, const char *local_name) } solo_file = local_name; dir_tweaking = !(list_only || solo_file || dry_run); - need_retouch_dir_times = preserve_times > 1; + need_retouch_dir_times = preserve_times & PRESERVE_DIR_TIMES; loopchk_limit = allowed_lull ? allowed_lull * 5 : 200; symlink_timeset_failed_flags = ITEM_REPORT_TIME | (protocol_version >= 30 || !am_server ? ITEM_REPORT_TIMEFAIL : 0); @@ -2074,12 +2124,6 @@ void generate_files(int f_out, const char *local_name) : "enabled"); } - /* Since we often fill up the outgoing socket and then just sit around - * waiting for the other 2 processes to do their thing, we don't want - * to exit on a timeout. If the data stops flowing, the receiver will - * notice that and let us know via the redo pipe (or its closing). */ - ignore_timeout = 1; - dflt_perms = (ACCESSPERMS & ~orig_umask); do { @@ -2133,7 +2177,7 @@ void generate_files(int f_out, const char *local_name) if (i + cur_flist->ndx_start >= next_loopchk) { if (allowed_lull) - maybe_send_keepalive(); + maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH); else maybe_flush_socket(0); next_loopchk += loopchk_limit;