diff options
| author | Wayne Davison <wayned@samba.org> | 2006-01-31 02:30:09 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-01-31 02:30:09 +0000 |
| commit | a9d6e6fcacf363b25023aeec3c8d706714ebebcd (patch) | |
| tree | fdc59133f73105eb7590d03c959090dee8eef9bf /generator.c | |
| parent | 860dcf68ad6270ed3d0b9b56bc2cb4a203b28dee (diff) | |
| download | android_external_rsync-a9d6e6fcacf363b25023aeec3c8d706714ebebcd.tar.gz android_external_rsync-a9d6e6fcacf363b25023aeec3c8d706714ebebcd.tar.bz2 android_external_rsync-a9d6e6fcacf363b25023aeec3c8d706714ebebcd.zip | |
When permissions aren't being preserved, set them via the new
dest_mode() function.
Diffstat (limited to 'generator.c')
| -rw-r--r-- | generator.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/generator.c b/generator.c index 44a097d4..4db5cbac 100644 --- a/generator.c +++ b/generator.c @@ -855,13 +855,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } - if (statret == 0 && !preserve_perms - && S_ISDIR(st.st_mode) == S_ISDIR(file->mode)) { - /* if the file exists already and we aren't perserving - * permissions then act as though the remote end sent - * us the file permissions we already have */ - file->mode = (file->mode & ~CHMOD_BITS) - | (st.st_mode & CHMOD_BITS); + /* If we're not preserving permissions, change the file-list's + * mode based on the local permissions and some heuristics. */ + if (!preserve_perms) { + int exists = statret == 0 + && S_ISDIR(st.st_mode) == S_ISDIR(file->mode); + file->mode = dest_mode(file->mode, st.st_mode, exists); } if (S_ISDIR(file->mode)) { |