X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/f9df736a3e22f15307f9e304eb9069b06e94208f..c0c7984e7f6009b6ab18ad3da998a56a9c0f083d:/omit-dir-changes.diff

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index b750253..b07ac10 100644
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -45,6 +45,7 @@ extern int preserve_hard_links;
+@@ -44,6 +44,7 @@ extern int preserve_hard_links;
  extern int preserve_executability;
  extern int preserve_perms;
  extern int preserve_times;
@@ -18,17 +18,17 @@ diff --git a/generator.c b/generator.c
  extern int uid_ndx;
  extern int gid_ndx;
  extern int delete_mode;
-@@ -625,6 +626,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
- 		    (receiver_symlink_times && !(file->flags & FLAG_TIME_FAILED)) ||
- #endif
- 		    !S_ISLNK(file->mode);
+@@ -624,6 +625,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;
-@@ -641,10 +643,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
- 		if ((preserve_perms || preserve_executability)
- 		 && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+ 		int keep_time = !preserve_times ? 0
+ 		    : S_ISDIR(file->mode) ? preserve_times > 1 :
+ #if defined HAVE_LUTIMES && defined HAVE_UTIMES
+@@ -653,10 +655,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
@@ -41,7 +41,7 @@ diff --git a/generator.c b/generator.c
  			iflags |= ITEM_REPORT_GROUP;
  #ifdef SUPPORT_ACLS
  		if (preserve_acls && !S_ISLNK(file->mode)) {
-@@ -1387,7 +1390,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1419,7 +1422,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  		real_sx = sx;
  		if (file->flags & FLAG_DIR_CREATED)
  			statret = -1;
@@ -53,7 +53,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -58,6 +58,7 @@ int preserve_specials = 0;
+@@ -59,6 +59,7 @@ int preserve_specials = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
@@ -61,7 +61,7 @@ diff --git a/options.c b/options.c
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -352,6 +353,7 @@ void usage(enum logcode F)
+@@ -353,6 +354,7 @@ void usage(enum logcode F)
    rprintf(F," -D                          same as --devices --specials\n");
    rprintf(F," -t, --times                 preserve modification times\n");
    rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
@@ -69,7 +69,7 @@ diff --git a/options.c b/options.c
    rprintf(F,"     --super                 receiver attempts super-user activities\n");
  #ifdef SUPPORT_XATTRS
    rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
-@@ -490,6 +492,7 @@ static struct poptOption long_options[] = {
+@@ -493,6 +495,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 },
@@ -77,7 +77,7 @@ diff --git a/options.c b/options.c
    {"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 },
-@@ -1483,6 +1486,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1509,6 +1512,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  		parse_rule(&filter_list, backup_dir_buf, 0, 0);
  	}
  
@@ -86,7 +86,7 @@ diff --git a/options.c b/options.c
  	if (make_backups && !backup_dir) {
  		omit_dir_times = 0; /* Implied, so avoid -O to sender. */
  		if (preserve_times > 1)
-@@ -1721,6 +1726,8 @@ void server_options(char **args, int *argc_p)
+@@ -1747,6 +1752,8 @@ void server_options(char **args, int *argc_p)
  			argstr[x++] = 'm';
  		if (omit_dir_times)
  			argstr[x++] = 'O';
@@ -106,7 +106,7 @@ diff --git a/rsync.c b/rsync.c
  extern int am_root;
  extern int am_server;
  extern int am_sender;
-@@ -404,9 +405,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -439,9 +440,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  			file->flags |= FLAG_TIME_FAILED;
  	}
  
@@ -131,7 +131,7 @@ diff --git a/rsync.yo b/rsync.yo
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
-@@ -987,6 +988,10 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
+@@ -994,6 +995,10 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
  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).