X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/20f90d5e8a58fa8992993b444897d435af4a7896..9ae7a2cddbb19d14e1b4453cfd40d840ea3042d2:/rsync.c diff --git a/rsync.c b/rsync.c index fec27c1c..9849180f 100644 --- a/rsync.c +++ b/rsync.c @@ -32,7 +32,6 @@ extern int verbose; extern int dry_run; -extern int logfile_format_has_i; extern int preserve_perms; extern int preserve_executability; extern int preserve_times; @@ -43,13 +42,17 @@ extern int am_sender; extern int am_generator; extern int am_starting_up; extern int allow_8bit_chars; +extern int protocol_version; extern int preserve_uid; extern int preserve_gid; +extern int incremental; 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 *cur_flist, *first_flist, *dir_flist; extern struct chmod_mode_struct *daemon_chmod_modes; #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H @@ -90,6 +93,105 @@ 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_ndx_and_attrs(int f_in, int f_out, 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 verbose_save, ndx; + + read_loop: + while (1) { + ndx = read_ndx(f_in); + + if (ndx >= 0) + break; + if (ndx == NDX_DONE) + return ndx; + if (!incremental || 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; + + /* 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); + *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 (!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); + } + + *iflag_ptr = iflags; + return ndx; +} + /* free a sums struct */ @@ -101,25 +203,27 @@ 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 cur_mode, int exists) +mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, 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)) - cur_mode &= ~0111; - else if (!(cur_mode & 0111)) - cur_mode |= (cur_mode & 0444) >> 2; + new_mode &= ~0111; + else if (!(stat_mode & 0111)) + new_mode |= (new_mode & 0444) >> 2; } - } else - cur_mode = flist_mode & ACCESSPERMS & ~orig_umask; - if (daemon_chmod_modes && !S_ISLNK(flist_mode)) - cur_mode = tweak_mode(cur_mode, daemon_chmod_modes); - return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS); + } else { + /* Apply the umask and turn off special permissions. */ + new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask)); + } + return new_mode; } int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, @@ -128,6 +232,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, int updated = 0; STRUCT_STAT st2; int change_uid, change_gid; + mode_t new_mode = file->mode; if (!st) { if (dry_run) @@ -138,11 +243,11 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, return 0; } st = &st2; - if (!preserve_perms && S_ISDIR(file->mode) + if (!preserve_perms && S_ISDIR(new_mode) && 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; } } @@ -160,9 +265,9 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, 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 && st->st_uid != F_UID(file); + change_gid = preserve_gid && F_GID(file) != GID_NONE + && st->st_gid != F_GID(file); #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK if (S_ISLNK(st->st_mode)) ; @@ -174,18 +279,18 @@ 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)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)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) : st->st_uid, + change_gid ? F_GID(file) : st->st_gid) != 0) { /* shouldn't have attempted to change uid or gid * unless have the privilege */ rsyserr(FERROR, errno, "%s %s failed", @@ -203,9 +308,11 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, updated = 1; } + if (daemon_chmod_modes && !S_ISLNK(new_mode)) + new_mode = tweak_mode(new_mode, daemon_chmod_modes); #ifdef HAVE_CHMOD - if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) { - int ret = do_chmod(fname, file->mode); + if (!BITS_EQUAL(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", @@ -218,11 +325,10 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, #endif if (verbose > 1 && flags & ATTRS_REPORT) { - enum logcode code = logfile_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); } return updated; } @@ -258,7 +364,7 @@ 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. */ @@ -298,6 +404,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) + 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)