From 5ca8a90c24390b56f9d101239c06002fbf0c577e Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 8 Feb 2006 02:34:06 +0000 Subject: [PATCH] Tweaked the name of one of dest_mode()'s args. --- rsync.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rsync.c b/rsync.c index aa9eabec..b03d2547 100644 --- a/rsync.c +++ b/rsync.c @@ -100,7 +100,7 @@ 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 cur_mode, int exists) { /* If the file already exists, we'll return the local permissions, * possibly tweaked by the --executability option. */ @@ -110,13 +110,13 @@ mode_t dest_mode(mode_t flist_mode, mode_t dest_mode, int exists) * 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; + cur_mode &= ~0111; + else if (!(cur_mode & 0111)) + cur_mode |= (cur_mode & 0444) >> 2; } } else - dest_mode = flist_mode & ACCESSPERMS & ~orig_umask; - return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS); + cur_mode = flist_mode & ACCESSPERMS & ~orig_umask; + return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS); } int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, -- 2.34.1