Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0679ac4
)
Tweaked the name of one of dest_mode()'s args.
author
Wayne Davison
<wayned@samba.org>
Wed, 8 Feb 2006 02:34:06 +0000
(
02:34
+0000)
committer
Wayne Davison
<wayned@samba.org>
Wed, 8 Feb 2006 02:34:06 +0000
(
02:34
+0000)
rsync.c
patch
|
blob
|
blame
|
history
diff --git
a/rsync.c
b/rsync.c
index
aa9eabe
..
b03d254
100644
(file)
--- 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. */
/* 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. */
{
/* 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))
* 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
}
} 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,
}
int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,