Ignore setfacl unless it tells us that it supports the -k option.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index e444def..34a070c 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -41,10 +41,12 @@ extern int preserve_devices;
 extern int preserve_specials;
 extern int preserve_hard_links;
 extern int preserve_perms;
+extern int preserve_executability;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_times;
 extern int omit_dir_times;
+extern int delete_mode;
 extern int delete_before;
 extern int delete_during;
 extern int delete_after;
@@ -144,7 +146,7 @@ static int delete_item(char *fname, int mode, int flags)
                return -1;
        }
 
-       zap_dir = flags & DEL_FORCE_RECURSE || (force_delete && recurse);
+       zap_dir = flags & DEL_FORCE_RECURSE || force_delete;
        if ((max_delete && ++deletion_count > max_delete)
            || (dry_run && zap_dir)) {
                ok = 0;
@@ -348,7 +350,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
                     && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
                    || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
                        iflags |= ITEM_REPORT_TIME;
-               if (preserve_perms
+               if ((preserve_perms || preserve_executability)
                 && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
                        iflags |= ITEM_REPORT_PERMS;
                if (preserve_uid && am_root && file->uid != st->st_uid)
@@ -780,6 +782,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        char *fnamecmp, *partialptr, *backupptr = NULL;
        char fnamecmpbuf[MAXPATHLEN];
        uchar fnamecmp_type;
+       int del_opts = DEL_TERSE | (delete_mode ? DEL_FORCE_RECURSE : 0);
 
        if (list_only)
                return;
@@ -853,13 +856,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)) {
@@ -869,7 +871,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                 * we need to delete it.  If it doesn't exist, then
                 * (perhaps recursively) create it. */
                if (statret == 0 && !S_ISDIR(st.st_mode)) {
-                       if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+                       if (delete_item(fname, st.st_mode, del_opts) < 0)
                                return;
                        statret = -1;
                }
@@ -944,7 +946,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        }
                        /* Not the right symlink (or not a symlink), so
                         * delete it. */
-                       if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+                       if (delete_item(fname, st.st_mode, del_opts) < 0)
                                return;
                        if (!S_ISLNK(st.st_mode))
                                statret = -1;
@@ -1002,7 +1004,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                 || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
                 || st.st_rdev != file->u.rdev) {
                        if (statret == 0
-                        && delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+                        && delete_item(fname, st.st_mode, del_opts) < 0)
                                return;
                        if (preserve_hard_links && file->link_u.links
                            && hard_link_check(file, ndx, fname, -1, &st,
@@ -1083,7 +1085,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        fnamecmp_type = FNAMECMP_FNAME;
 
        if (statret == 0 && !S_ISREG(st.st_mode)) {
-               if (delete_item(fname, st.st_mode, DEL_TERSE) != 0)
+               if (delete_item(fname, st.st_mode, del_opts) != 0)
                        return;
                statret = -1;
                stat_errno = ENOENT;