X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d2aee174e68b860180e8cd17070a63675fe2e3a1..16edf86595a5a990a942fa045dfb523dae1fe6cb:/rsync.c diff --git a/rsync.c b/rsync.c index 4649752e..7e97a930 100644 --- a/rsync.c +++ b/rsync.c @@ -3,12 +3,11 @@ * * Copyright (C) 1996 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras - * 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 @@ -32,6 +31,8 @@ extern int verbose; extern int dry_run; +extern int preserve_acls; +extern int preserve_xattrs; extern int preserve_perms; extern int preserve_executability; extern int preserve_times; @@ -45,12 +46,12 @@ extern int allow_8bit_chars; extern int protocol_version; extern int preserve_uid; extern int preserve_gid; +extern int inc_recurse; extern int inplace; +extern int flist_eof; extern int keep_dirlinks; extern int make_backups; -extern mode_t orig_umask; -extern struct stats stats; -extern struct file_list *the_file_list; +extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct chmod_mode_struct *daemon_chmod_modes; #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H @@ -91,28 +92,72 @@ void setup_iconv() } #endif -/* This is used by sender.c with a valid f_out, and by receive.c with - * f_out = -1. */ -int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr, - char *buf, int *len_ptr) +int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, + char *buf, int *len_ptr) { - int len; + int len, iflags = 0; + struct file_list *flist; uchar fnamecmp_type = FNAMECMP_FNAME; - int iflags = protocol_version >= 29 ? read_shortint(f_in) + int verbose_save, ndx; + + read_loop: + while (1) { + ndx = read_ndx(f_in); + + if (ndx >= 0) + break; + if (ndx == NDX_DONE) + return ndx; + if (!inc_recurse || am_sender) + goto invalid_ndx; + if (ndx == NDX_FLIST_EOF) { + flist_eof = 1; + send_msg(MSG_FLIST_EOF, "", 0); + continue; + } + ndx = NDX_FLIST_OFFSET - ndx; + if (ndx < 0 || ndx >= dir_flist->count) { + ndx = NDX_FLIST_OFFSET - ndx; + rprintf(FERROR, + "Invalid dir index: %d (%d - %d)\n", + ndx, NDX_FLIST_OFFSET, + NDX_FLIST_OFFSET - dir_flist->count); + exit_cleanup(RERR_PROTOCOL); + } + verbose_save = verbose; + verbose = 0; /* TODO allow verbose messages? */ + + /* Send everything read from f_in to msg_fd_out. */ + send_msg_int(MSG_FLIST, ndx); + start_flist_forward(f_in); + flist = recv_file_list(f_in); + flist->parent_ndx = ndx; + stop_flist_forward(); + + verbose = verbose_save; + } + + iflags = protocol_version >= 29 ? read_shortint(f_in) : ITEM_TRANSFER | ITEM_MISSING_DATA; - /* Handle the new keep-alive (no-op) packet. */ - if (ndx == the_file_list->count && iflags == ITEM_IS_NEW) - ; - else if (ndx < 0 || ndx >= the_file_list->count) { - rprintf(FERROR, "Invalid file index: %d (count=%d) [%s]\n", - ndx, the_file_list->count, who_am_i()); - exit_cleanup(RERR_PROTOCOL); - } else if (iflags == ITEM_IS_NEW) { - rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n", - iflags, who_am_i()); + /* Honor the old-style keep-alive indicator. */ + if (protocol_version < 30 + && ndx == cur_flist->count && iflags == ITEM_IS_NEW) { + if (am_sender) + maybe_send_keepalive(); + goto read_loop; + } + + if (!(flist = flist_for_ndx(ndx))) { + invalid_ndx: + rprintf(FERROR, + "Invalid file index: %d (%d - %d) with iflags %x [%s]\n", + ndx, first_flist->ndx_start + first_flist->ndx_start, + first_flist->prev->ndx_start + first_flist->ndx_start + + first_flist->prev->count - 1, iflags, who_am_i()); exit_cleanup(RERR_PROTOCOL); } + cur_flist = flist; if (iflags & ITEM_BASIS_TYPE_FOLLOWS) fnamecmp_type = read_byte(f_in); @@ -128,18 +173,17 @@ int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr, *len_ptr = len; if (iflags & ITEM_TRANSFER) { - if (!S_ISREG(the_file_list->files[ndx]->mode)) { + int i = ndx - cur_flist->ndx_start; + if (!S_ISREG(cur_flist->files[i]->mode)) { rprintf(FERROR, "received request to transfer non-regular file: %d [%s]\n", ndx, who_am_i()); exit_cleanup(RERR_PROTOCOL); } - } else if (f_out >= 0) { - write_ndx_and_attrs(f_out, ndx, iflags, - fnamecmp_type, buf, len); } - return iflags; + *iflag_ptr = iflags; + return ndx; } /* @@ -153,7 +197,8 @@ void free_sums(struct sum_struct *s) /* This is only called when we aren't preserving permissions. Figure out what * the permissions should be and return them merged back into the mode. */ -mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists) +mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, + int exists) { int new_mode; /* If the file already exists, we'll return the local permissions, @@ -170,56 +215,73 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists) new_mode |= (new_mode & 0444) >> 2; } } else { - /* Apply the umask and turn off special permissions. */ - new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask)); + /* Apply destination default permissions and turn + * off special permissions. */ + new_mode = flist_mode & (~CHMOD_BITS | dflt_perms); } return new_mode; } -int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, - int flags) +int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp, + const char *fnamecmp, int flags) { int updated = 0; - STRUCT_STAT st2; + statx sx2; int change_uid, change_gid; mode_t new_mode = file->mode; - if (!st) { + if (!sxp) { if (dry_run) return 1; - if (link_stat(fname, &st2, 0) < 0) { + if (link_stat(fname, &sx2.st, 0) < 0) { rsyserr(FERROR, errno, "stat %s failed", full_fname(fname)); return 0; } - st = &st2; +#ifdef SUPPORT_ACLS + sx2.acc_acl = sx2.def_acl = NULL; +#endif +#ifdef SUPPORT_XATTRS + sx2.xattr = NULL; +#endif if (!preserve_perms && S_ISDIR(new_mode) - && st->st_mode & S_ISGID) { + && sx2.st.st_mode & S_ISGID) { /* We just created this directory and its setgid * bit is on, so make sure it stays on. */ new_mode |= S_ISGID; } + sxp = &sx2; } - if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times)) +#ifdef SUPPORT_ACLS + if (preserve_acls && !S_ISLNK(file->mode) && !ACL_READY(*sxp)) + get_acl(fname, sxp); +#endif + +#ifdef SUPPORT_XATTRS + if (preserve_xattrs && fnamecmp) + set_xattr(fname, file, fnamecmp, sxp); +#endif + + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times)) flags |= ATTRS_SKIP_MTIME; if (!(flags & ATTRS_SKIP_MTIME) - && cmp_time(st->st_mtime, file->modtime) != 0) { - int ret = set_modtime(fname, file->modtime, st->st_mode); + && cmp_time(sxp->st.st_mtime, file->modtime) != 0) { + int ret = set_modtime(fname, file->modtime, sxp->st.st_mode); if (ret < 0) { rsyserr(FERROR, errno, "failed to set times on %s", full_fname(fname)); - return 0; + goto cleanup; } if (ret == 0) /* ret == 1 if symlink could not be set */ updated = 1; } - change_uid = am_root && preserve_uid && st->st_uid != file->uid; - change_gid = preserve_gid && file->gid != GID_NONE - && st->st_gid != file->gid; + change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file); + change_gid = preserve_gid && F_GID(file) != GID_NONE + && sxp->st.st_gid != F_GID(file); #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK - if (S_ISLNK(st->st_mode)) + if (S_ISLNK(sxp->st.st_mode)) ; else #endif @@ -229,45 +291,57 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, rprintf(FINFO, "set uid of %s from %ld to %ld\n", fname, - (long)st->st_uid, (long)file->uid); + (long)sxp->st.st_uid, (long)F_UID(file)); } if (change_gid) { rprintf(FINFO, "set gid of %s from %ld to %ld\n", fname, - (long)st->st_gid, (long)file->gid); + (long)sxp->st.st_gid, (long)F_GID(file)); } } if (do_lchown(fname, - change_uid ? file->uid : st->st_uid, - change_gid ? file->gid : st->st_gid) != 0) { + change_uid ? F_UID(file) : sxp->st.st_uid, + change_gid ? F_GID(file) : sxp->st.st_gid) != 0) { /* shouldn't have attempted to change uid or gid * unless have the privilege */ rsyserr(FERROR, errno, "%s %s failed", change_uid ? "chown" : "chgrp", full_fname(fname)); - return 0; + goto cleanup; } /* a lchown had been done - we have to re-stat if the * destination had the setuid or setgid bits set due * to the side effect of the chown call */ - if (st->st_mode & (S_ISUID | S_ISGID)) { - link_stat(fname, st, - keep_dirlinks && S_ISDIR(st->st_mode)); + if (sxp->st.st_mode & (S_ISUID | S_ISGID)) { + link_stat(fname, &sxp->st, + keep_dirlinks && S_ISDIR(sxp->st.st_mode)); } updated = 1; } if (daemon_chmod_modes && !S_ISLNK(new_mode)) new_mode = tweak_mode(new_mode, daemon_chmod_modes); + +#ifdef SUPPORT_ACLS + /* It's OK to call set_acl() now, even for a dir, as the generator + * will enable owner-writability using chmod, if necessary. + * + * If set_acl() changes permission bits in the process of setting + * an access ACL, it changes sxp->st.st_mode so we know whether we + * need to chmod(). */ + if (preserve_acls && !S_ISLNK(new_mode) && set_acl(fname, file, sxp) == 0) + updated = 1; +#endif + #ifdef HAVE_CHMOD - if ((st->st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) { + if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) { int ret = do_chmod(fname, new_mode); if (ret < 0) { rsyserr(FERROR, errno, "failed to set permissions on %s", full_fname(fname)); - return 0; + goto cleanup; } if (ret == 0) /* ret == 1 if symlink could not be set */ updated = 1; @@ -280,6 +354,17 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, else rprintf(FCLIENT, "%s is uptodate\n", fname); } + cleanup: + if (sxp == &sx2) { +#ifdef SUPPORT_ACLS + if (preserve_acls) + free_acl(&sx2); +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + free_xattr(&sx2); +#endif + } return updated; } @@ -301,7 +386,8 @@ RETSIGTYPE sig_int(UNUSED(int val)) * attributes (e.g. permissions, ownership, etc.). If partialptr is not * NULL and the robust_rename() call is forced to copy the temp file, we * stage the file into the partial-dir and then rename it into place. */ -void finish_transfer(char *fname, char *fnametmp, char *partialptr, +void finish_transfer(const char *fname, const char *fnametmp, + const char *fnamecmp, const char *partialptr, struct file_struct *file, int ok_to_set_time, int overwriting_basis) { @@ -314,11 +400,11 @@ void finish_transfer(char *fname, char *fnametmp, char *partialptr, goto do_set_file_attrs; } - if (make_backups && overwriting_basis && !make_backup(fname)) + if (make_backups > 0 && overwriting_basis && !make_backup(fname)) return; /* Change permissions before putting the file into place. */ - set_file_attrs(fnametmp, file, NULL, + set_file_attrs(fnametmp, file, NULL, fnamecmp, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); /* move tmp file over real file */ @@ -342,7 +428,7 @@ void finish_transfer(char *fname, char *fnametmp, char *partialptr, fnametmp = partialptr ? partialptr : fname; do_set_file_attrs: - set_file_attrs(fnametmp, file, NULL, + set_file_attrs(fnametmp, file, NULL, fnamecmp, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); if (partialptr) { @@ -354,6 +440,25 @@ void finish_transfer(char *fname, char *fnametmp, char *partialptr, } } +struct file_list *flist_for_ndx(int ndx) +{ + struct file_list *flist = cur_flist; + + if (!flist && !(flist = first_flist)) + return NULL; + + while (ndx < flist->ndx_start) { + if (flist == first_flist) + return NULL; + flist = flist->prev; + } + while (ndx >= flist->ndx_start + flist->count) { + if (!(flist = flist->next)) + return NULL; + } + return flist; +} + const char *who_am_i(void) { if (am_starting_up)