./configure (optional if already run)
make
---- old/generator.c
-+++ new/generator.c
-@@ -43,6 +43,7 @@ extern int preserve_specials;
- extern int preserve_hard_links;
+based-on: 8946cfc6f8018e30740ee1db4cc2e2008e4f7e7e
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -44,6 +44,7 @@ extern int preserve_hard_links;
+ extern int preserve_executability;
extern int preserve_perms;
extern int preserve_times;
+extern int omit_dir_changes;
- extern int uid_ndx;
- extern int gid_ndx;
extern int delete_mode;
-@@ -554,6 +555,7 @@ void itemize(const char *fnamecmp, struc
- int keep_time = !preserve_times ? 0
- : S_ISDIR(file->mode) ? preserve_times > 1
- : !S_ISLNK(file->mode);
+ extern int delete_before;
+ extern int delete_during;
+@@ -481,6 +482,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ const char *xname)
+ {
+ if (statret >= 0) { /* A from-dest-dir statret can == 1! */
+ 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;
-@@ -569,10 +571,11 @@ void itemize(const char *fnamecmp, struc
- #endif
- if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+ int keep_time = !preserve_times ? 0
+ : S_ISDIR(file->mode) ? preserve_times & PRESERVE_DIR_TIMES
+ : S_ISLNK(file->mode) ? preserve_times & PRESERVE_LINK_TIMES
+@@ -507,10 +509,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ } else if (preserve_executability
+ && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
iflags |= ITEM_REPORT_PERMS;
- if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
+ if (uid_ndx && am_root && !omit_changes
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
-@@ -1288,7 +1291,7 @@ static void recv_generator(char *fname,
- real_sx = sx;
+@@ -1377,7 +1380,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ real_ret = statret;
if (file->flags & FLAG_DIR_CREATED)
statret = -1;
- if (!preserve_perms) { /* 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
-@@ -57,6 +57,7 @@ int preserve_specials = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -59,6 +59,7 @@ int preserve_specials = 0;
int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -346,6 +347,7 @@ void usage(enum logcode F)
- rprintf(F," -D same as --devices --specials\n");
+@@ -709,6 +710,7 @@ void usage(enum logcode F)
rprintf(F," -t, --times preserve modification times\n");
rprintf(F," -O, --omit-dir-times omit directories from --times\n");
+ rprintf(F," -J, --omit-link-times omit symlinks from --times\n");
+ rprintf(F," --omit-dir-changes omit directories from any attribute changes\n");
rprintf(F," --super receiver attempts super-user activities\n");
#ifdef SUPPORT_XATTRS
rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
-@@ -483,6 +485,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 },
+@@ -871,6 +873,7 @@ static struct poptOption long_options[] = {
+ {"omit-link-times", 'J', POPT_ARG_VAL, &omit_link_times, 1, 0, 0 },
+ {"no-omit-link-times",0, POPT_ARG_VAL, &omit_link_times, 0, 0, 0 },
+ {"no-J", 0, POPT_ARG_VAL, &omit_link_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 },
-@@ -1451,6 +1454,8 @@ int parse_arguments(int *argc_p, const c
- parse_rule(&filter_list, backup_dir_buf, 0, 0);
+@@ -2137,6 +2140,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
}
+ 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)
-@@ -1687,6 +1692,8 @@ void server_options(char **args, int *ar
- argstr[x++] = 'm';
- if (omit_dir_times)
++
+ if (preserve_times) {
+ preserve_times = PRESERVE_FILE_TIMES;
+ if (!omit_dir_times)
+@@ -2388,6 +2394,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'O';
+ if (omit_link_times)
+ argstr[x++] = 'J';
+ if (omit_dir_changes == 1)
+ args[ac++] = "--omit-dir-changes";
- } else {
- if (copy_links)
- argstr[x++] = 'L';
---- old/rsync.c
-+++ new/rsync.c
-@@ -34,6 +34,7 @@ extern int preserve_xattrs;
+ if (fuzzy_basis) {
+ argstr[x++] = 'y';
+ if (fuzzy_basis > 1)
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
+@@ -33,6 +33,7 @@ extern int preserve_xattrs;
extern int preserve_perms;
extern int preserve_executability;
extern int preserve_times;
+extern int omit_dir_changes;
extern int am_root;
extern int am_server;
- extern int am_sender;
-@@ -397,9 +398,11 @@ int set_file_attrs(const char *fname, st
- updated = 1;
- }
+ extern int am_daemon;
+@@ -489,9 +490,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ get_acl(fname, sxp);
+ #endif
- 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)
- && 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
+ #ifndef CAN_CHOWN_SYMLINK
if (S_ISLNK(sxp->st.st_mode)) {
;
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -349,6 +349,7 @@ to the detailed description below for a
- -D same as --devices --specials
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -371,6 +371,7 @@ to the detailed description below for a complete description. verb(
-t, --times preserve modification times
-O, --omit-dir-times omit directories from --times
+ -J, --omit-link-times omit symlinks from --times
+ --omit-dir-changes omit directories from any attribute changes
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
-S, --sparse handle sparse files efficiently
-@@ -965,6 +966,10 @@ it is preserving modification times (see
- the directories on the receiving side, it is a good idea to use bf(-O).
- This option is inferred if you use bf(--backup) without bf(--backup-dir).
+@@ -1170,6 +1171,10 @@ This option is inferred if you use bf(--backup) without bf(--backup-dir).
+ dit(bf(-J, --omit-link-times)) This tells rsync to omit symlinks when
+ it is preserving modification times (see bf(--times)).
+dit(bf(--omit-dir-changes)) This tells rsync to omit directories when applying
+any preserved attributes (owner, group, times, permissions) to already existing
git.samba.org / rsync-patches.git / blobdiff