X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/59d64e0ba3e9b104bed3cb7c99e23066676be9d5..a54a2c4d2d84418b6658697c7926321278e1e34f:/omit-dir-changes.diff diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff index 83fe03b..bd4fca2 100644 --- a/omit-dir-changes.diff +++ b/omit-dir-changes.diff @@ -1,125 +1,119 @@ This patch from Antti Tapaninen added the --omit-dir-changes option, which tells rsync to not affect any attributes on the directories in the transfer. +To use this patch, run these commands for a successful build: + + patch -p1 mode) ? preserve_times > 1 + : !S_ISLNK(file->mode); ++ int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode); + + if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size) + iflags |= ITEM_REPORT_SIZE; +@@ -565,10 +567,11 @@ void itemize(const char *fnamecmp, struc iflags |= ITEM_REPORT_TIME; - if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) + if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; -- if (preserve_uid && am_root && file->uid != st->st_uid) -+ if (preserve_uid && am_root && file->uid != st->st_uid -+ && !(omit_dir_changes && S_ISDIR(st->st_mode))) +- if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) ++ if (uid_ndx && am_root && !omit_changes ++ && (uid_t)F_OWNER(file) != sxp->st.st_uid) iflags |= ITEM_REPORT_OWNER; -- if (preserve_gid && file->gid != GID_NONE -- && st->st_gid != file->gid) -+ if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid -+ && !(omit_dir_changes && S_ISDIR(st->st_mode))) +- if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) +- && sxp->st.st_gid != (gid_t)F_GROUP(file)) ++ if (gid_ndx && !omit_changes ++ && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file)) iflags |= ITEM_REPORT_GROUP; - } else - iflags |= ITEM_IS_NEW; -@@ -895,7 +897,7 @@ static void recv_generator(char *fname, - - /* If we're not preserving permissions, change the file-list's - * mode based on the local permissions and some heuristics. */ -- if (!preserve_perms) { -+ if (!preserve_perms || (omit_dir_changes && S_ISDIR(st.st_mode))) { - int exists = statret == 0 - && S_ISDIR(st.st_mode) == S_ISDIR(file->mode); - file->mode = dest_mode(file->mode, st.st_mode, exists); + #ifdef SUPPORT_ACLS + if (preserve_acls && !S_ISLNK(file->mode)) { +@@ -1235,7 +1238,7 @@ static void recv_generator(char *fname, + statret = -1; + new_root_dir = 0; + } +- if (!preserve_perms) { /* See comment in non-dir code below. */ ++ if (!preserve_perms || omit_dir_changes) { /* See comment in non-dir code below. */ + file->mode = dest_mode(file->mode, sx.st.st_mode, + dflt_perms, statret == 0); + } --- old/options.c +++ new/options.c -@@ -55,6 +55,7 @@ int preserve_uid = 0; +@@ -56,6 +56,7 @@ int preserve_specials = 0; + int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; - int omit_dir_times = 0; +int omit_dir_changes = 0; int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -311,6 +312,7 @@ void usage(enum logcode F) +@@ -344,6 +345,7 @@ void usage(enum logcode F) rprintf(F," -D same as --devices --specials\n"); - rprintf(F," -t, --times preserve times\n"); - rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); -+ rprintf(F," --omit-dir-changes omit directories when preserving any attributes\n"); + rprintf(F," -t, --times preserve modification times\n"); + rprintf(F," -O, --omit-dir-times omit directories from --times\n"); ++ rprintf(F," --omit-dir-changes omit directories any attribute changes\n"); rprintf(F," --super receiver attempts super-user activities\n"); - rprintf(F," -S, --sparse handle sparse files efficiently\n"); - rprintf(F," -n, --dry-run show what would have been transferred\n"); -@@ -425,6 +427,7 @@ static struct poptOption long_options[] - {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, - {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, - {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 }, + #ifdef SUPPORT_XATTRS + rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); +@@ -480,6 +482,7 @@ static struct poptOption long_options[] + {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 }, + {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 }, + {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 }, + {"omit-dir-changes", 0, POPT_ARG_NONE, &omit_dir_changes, 0, 0, 0 }, {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 }, {"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 }, -@@ -1285,6 +1288,9 @@ int parse_arguments(int *argc, const cha - "P *%s", backup_suffix); - parse_rule(&filter_list, backup_dir_buf, 0, 0); +@@ -1430,6 +1433,8 @@ int parse_arguments(int *argc, const cha + parse_rule(&filter_list, backup_dir_buf, 0, 0); } -+ -+ if (omit_dir_changes) -+ omit_dir_times = 2; - if (make_backups && !backup_dir) - omit_dir_times = 1; -@@ -1513,6 +1519,8 @@ void server_options(char **args,int *arg ++ if (omit_dir_changes) ++ omit_dir_times = 1; + if (make_backups && !backup_dir) { + omit_dir_times = 0; /* Implied, so avoid -O to sender. */ + if (preserve_times > 1) +@@ -1665,6 +1670,8 @@ void server_options(char **args,int *arg argstr[x++] = 'm'; - if (omit_dir_times == 2) + if (omit_dir_times) argstr[x++] = 'O'; + if (omit_dir_changes == 1) + args[ac++] = "--omit-dir-changes"; } else { if (copy_links) argstr[x++] = 'L'; ---- old/receiver.c -+++ new/receiver.c -@@ -37,6 +37,7 @@ extern int protocol_version; - extern int relative_paths; - extern int preserve_hard_links; - extern int preserve_perms; -+extern int omit_dir_changes; - extern int basis_dir_cnt; - extern int make_backups; - extern int cleanup_got_literal; -@@ -541,7 +542,7 @@ int recv_files(int f_in, struct file_lis - - /* If we're not preserving permissions, change the file-list's - * mode based on the local permissions and some heuristics. */ -- if (!preserve_perms) { -+ if (!preserve_perms || (omit_dir_changes && S_ISDIR(st.st_mode))) { - int exists = fd1 != -1; - file->mode = dest_mode(file->mode, st.st_mode, exists); - } --- old/rsync.c +++ new/rsync.c -@@ -36,6 +36,7 @@ extern int preserve_perms; +@@ -33,6 +33,7 @@ extern int preserve_xattrs; + extern int preserve_perms; extern int preserve_executability; extern int preserve_times; - extern int omit_dir_times; +extern int omit_dir_changes; extern int am_root; extern int am_server; extern int am_sender; -@@ -159,9 +160,11 @@ int set_file_attrs(char *fname, struct f +@@ -324,9 +325,11 @@ int set_file_attrs(const char *fname, st updated = 1; } -- change_uid = am_root && preserve_uid && st->st_uid != file->uid; -+ change_uid = am_root && preserve_uid && st->st_uid != file->uid -+ && !(omit_dir_changes && S_ISDIR(st->st_mode)); - change_gid = preserve_gid && file->gid != GID_NONE -- && st->st_gid != file->gid; -+ && st->st_gid != file->gid -+ && !(omit_dir_changes && S_ISDIR(st->st_mode)); +- change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file); ++ change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file) ++ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode)); + change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP) +- && sxp->st.st_gid != (gid_t)F_GROUP(file); ++ && sxp->st.st_gid != (gid_t)F_GROUP(file) ++ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode)); #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK - if (S_ISLNK(st->st_mode)) + if (S_ISLNK(sxp->st.st_mode)) ;