X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2a62f5ee1933a98a4eb3b62cbd4ec490fc14f65a..8e41b68e8f975c02a5d9281be780ba5d1a385107:/rsync.c diff --git a/rsync.c b/rsync.c index 28d9612c..4fcdea1d 100644 --- a/rsync.c +++ b/rsync.c @@ -1,29 +1,25 @@ /* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 - - 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. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -/* this file contains code used by more than one part of the rsync - process */ + * Routines common to more than one of the rsync processes. + * + * Copyright (C) 1996 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * 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 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, visit the http://fsf.org website. + */ #include "rsync.h" -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H -#include -#endif #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET #include #elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO @@ -32,36 +28,45 @@ extern int verbose; extern int dry_run; -extern int daemon_log_format_has_i; +extern int preserve_acls; +extern int preserve_xattrs; extern int preserve_perms; extern int preserve_executability; extern int preserve_times; extern int omit_dir_times; -extern int orig_umask; extern int am_root; extern int am_server; extern int am_sender; extern int am_generator; extern int am_starting_up; -extern int preserve_uid; -extern int preserve_gid; +extern int allow_8bit_chars; +extern int protocol_version; +extern int uid_ndx; +extern int gid_ndx; +extern int inc_recurse; extern int inplace; +extern int flist_eof; extern int keep_dirlinks; extern int make_backups; -extern struct stats stats; +extern struct file_list *cur_flist, *first_flist, *dir_flist; +extern struct chmod_mode_struct *daemon_chmod_modes; +#ifdef ICONV_OPTION +extern char *iconv_opt; +#endif -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#ifdef ICONV_CONST iconv_t ic_chck = (iconv_t)-1; +#ifdef ICONV_OPTION +iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1; +int ic_ndx; +#endif static const char *default_charset(void) { #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET return locale_charset(); #elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO - const char *def = nl_langinfo(CODESET); - if (strcmp(def, "646") == 0) /* Solaris brain-damage */ - return "ascii"; - return def; + return nl_langinfo(CODESET); #else return ""; /* Works with (at the very least) gnu iconv... */ #endif @@ -70,16 +75,163 @@ static const char *default_charset(void) void setup_iconv() { const char *defset = default_charset(); +# ifdef ICONV_OPTION + const char *charset; + char *cp; +#endif + + if (!am_server && !allow_8bit_chars) { + + /* It's OK if this fails... */ + ic_chck = iconv_open(defset, defset); - if (!am_server - && (ic_chck = iconv_open(defset, defset)) == (iconv_t)-1) { + if (verbose > 3) { + if (ic_chck == (iconv_t)-1) { + rprintf(FINFO, + "note: iconv_open(\"%s\", \"%s\") failed (%d)" + " -- using isprint() instead of iconv().\n", + defset, defset, errno); + } else { + rprintf(FINFO, + "note: iconv_open(\"%s\", \"%s\") succeeded.\n", + defset, defset); + } + } + } + +# ifdef ICONV_OPTION + if (!iconv_opt) + return; + + if ((cp = strchr(iconv_opt, ',')) != NULL) { + if (am_server) /* A local transfer needs this. */ + iconv_opt = cp + 1; + else + *cp = '\0'; + } + + if (!*iconv_opt || (*iconv_opt == '.' && iconv_opt[1] == '\0')) + charset = defset; + else + charset = iconv_opt; + + if ((ic_send = iconv_open(UTF8_CHARSET, charset)) == (iconv_t)-1) { + rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n", + UTF8_CHARSET, charset); + exit_cleanup(RERR_UNSUPPORTED); + } + + if ((ic_recv = iconv_open(charset, UTF8_CHARSET)) == (iconv_t)-1) { rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n", - defset, defset); + charset, UTF8_CHARSET); exit_cleanup(RERR_UNSUPPORTED); } + + if (!am_sender || inc_recurse) + ic_ndx = ++file_extra_cnt; + + if (verbose > 1) { + rprintf(FINFO, "%s charset: %s\n", + am_server ? "server" : "client", + *charset ? charset : "[LOCALE]"); + } +# endif } #endif +int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, + char *buf, int *len_ptr) +{ + int len, iflags = 0; + struct file_list *flist; + uchar fnamecmp_type = FNAMECMP_FNAME; + int 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, 0); + continue; + } + ndx = NDX_FLIST_OFFSET - ndx; + if (ndx < 0 || ndx >= dir_flist->used) { + ndx = NDX_FLIST_OFFSET - ndx; + rprintf(FERROR, + "[%s] Invalid dir index: %d (%d - %d)\n", + who_am_i(), ndx, NDX_FLIST_OFFSET, + NDX_FLIST_OFFSET - dir_flist->used + 1); + exit_cleanup(RERR_PROTOCOL); + } + + /* Send everything read from f_in to msg_fd_out. */ + send_msg_int(MSG_FLIST, ndx); + start_flist_forward(f_in); + if (verbose > 3) { + rprintf(FINFO, "[%s] receiving flist for dir %d\n", + who_am_i(), ndx); + } + flist = recv_file_list(f_in); + flist->parent_ndx = ndx; + stop_flist_forward(); + } + + iflags = protocol_version >= 29 ? read_shortint(f_in) + : ITEM_TRANSFER | ITEM_MISSING_DATA; + + /* Honor the old-style keep-alive indicator. */ + if (protocol_version < 30 + && ndx == cur_flist->used && 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 - 1, first_flist->prev->ndx_end, + iflags, who_am_i()); + exit_cleanup(RERR_PROTOCOL); + } + cur_flist = flist; + + if (iflags & ITEM_BASIS_TYPE_FOLLOWS) + fnamecmp_type = read_byte(f_in); + *type_ptr = fnamecmp_type; + + if (iflags & ITEM_XNAME_FOLLOWS) { + if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0) + exit_cleanup(RERR_PROTOCOL); + } else { + *buf = '\0'; + len = -1; + } + *len_ptr = len; + + if (iflags & ITEM_TRANSFER) { + int i = ndx - cur_flist->ndx_start; + if (i < 0 || !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); + } + } + + *iflag_ptr = iflags; + return ndx; +} + /* free a sums struct */ @@ -91,68 +243,93 @@ 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 dest_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, * possibly tweaked by the --executability option. */ if (exists) { + new_mode = (flist_mode & ~CHMOD_BITS) | (stat_mode & CHMOD_BITS); if (preserve_executability && S_ISREG(flist_mode)) { /* If the source file is executable, grant execute * rights to everyone who can read, but ONLY if the * file isn't already executable. */ if (!(flist_mode & 0111)) - dest_mode &= ~0111; - else if (!(dest_mode & 0111)) - dest_mode |= (dest_mode & 0444) >> 2; + new_mode &= ~0111; + else if (!(stat_mode & 0111)) + new_mode |= (new_mode & 0444) >> 2; } - } else - dest_mode = flist_mode & ACCESSPERMS & ~orig_umask; - return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS); + } else { + /* 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; - if (!preserve_perms && S_ISDIR(file->mode) - && st->st_mode & S_ISGID) { +#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) + && sx2.st.st_mode & S_ISGID) { /* We just created this directory and its setgid * bit is on, so make sure it stays on. */ - file->mode |= S_ISGID; + 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); + if (am_root < 0) + set_stat_xattr(fname, file); +#endif + + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times)) flags |= ATTRS_SKIP_MTIME; if (!(flags & ATTRS_SKIP_MTIME) - && cmp_modtime(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 && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file); + change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP) + && sxp->st.st_gid != (gid_t)F_GROUP(file); #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK - if (S_ISLNK(st->st_mode)) + if (S_ISLNK(sxp->st.st_mode)) ; else #endif @@ -160,45 +337,59 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, if (verbose > 2) { if (change_uid) { rprintf(FINFO, - "set uid of %s from %ld to %ld\n", - fname, - (long)st->st_uid, (long)file->uid); + "set uid of %s from %u to %u\n", + fname, (unsigned)sxp->st.st_uid, F_OWNER(file)); } if (change_gid) { rprintf(FINFO, - "set gid of %s from %ld to %ld\n", - fname, - (long)st->st_gid, (long)file->gid); + "set gid of %s from %u to %u\n", + fname, (unsigned)sxp->st.st_gid, F_GROUP(file)); } } - if (do_lchown(fname, - change_uid ? file->uid : st->st_uid, - change_gid ? file->gid : st->st_gid) != 0) { + if (am_root < 0) { + ; + } else if (do_lchown(fname, + change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid, + change_gid ? (gid_t)F_GROUP(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; + } else /* 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) != (file->mode & CHMOD_BITS)) { - int ret = do_chmod(fname, file->mode); + if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) { + int ret = am_root < 0 ? 0 : 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; @@ -206,12 +397,21 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, #endif if (verbose > 1 && flags & ATTRS_REPORT) { - enum logcode code = daemon_log_format_has_i || dry_run - ? FCLIENT : FINFO; if (updated) - rprintf(code, "%s\n", fname); + rprintf(FCLIENT, "%s\n", fname); else - rprintf(code, "%s is uptodate\n", fname); + 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; } @@ -234,7 +434,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) { @@ -247,11 +448,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 */ @@ -275,7 +476,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) { @@ -287,6 +488,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-1) { + if (flist == first_flist) + return NULL; + flist = flist->prev; + } + while (ndx > flist->ndx_end) { + if (!(flist = flist->next)) + return NULL; + } + return flist; +} + const char *who_am_i(void) { if (am_starting_up)