X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7170ca8dba0a407cd0c91b41b48163c7b682abb1..5214a41bbae94607b196b199b483710e1babf292:/omit-dir-changes.diff

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index 058fe3e..92dc4c3 100644
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -26,7 +26,7 @@ diff --git a/generator.c b/generator.c
 +		int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
  		int keep_time = !preserve_times ? 0
  		    : S_ISDIR(file->mode) ? preserve_times > 1 :
- #if defined HAVE_LUTIMES && defined HAVE_UTIMES
+ #ifdef CAN_SET_SYMLINK_TIMES
 @@ -466,10 +468,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)))
@@ -42,7 +42,7 @@ diff --git a/generator.c b/generator.c
  			iflags |= ITEM_REPORT_GROUP;
  #ifdef SUPPORT_ACLS
  		if (preserve_acls && !S_ISLNK(file->mode)) {
-@@ -1254,7 +1257,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1261,7 +1264,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  		real_sx = sx;
  		if (file->flags & FLAG_DIR_CREATED)
  			statret = -1;
@@ -62,7 +62,7 @@ diff --git a/options.c b/options.c
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -698,6 +699,7 @@ void usage(enum logcode F)
+@@ -699,6 +700,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");
@@ -70,7 +70,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");
-@@ -848,6 +850,7 @@ static struct poptOption long_options[] = {
+@@ -849,6 +851,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 },
@@ -78,7 +78,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 },
-@@ -2037,6 +2040,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2057,6 +2060,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  		parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
  	}
  
@@ -87,7 +87,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)
-@@ -2280,6 +2285,8 @@ void server_options(char **args, int *argc_p)
+@@ -2300,6 +2305,8 @@ void server_options(char **args, int *argc_p)
  			argstr[x++] = 'm';
  		if (omit_dir_times)
  			argstr[x++] = 'O';
@@ -107,7 +107,7 @@ diff --git a/rsync.c b/rsync.c
  extern int am_root;
  extern int am_server;
  extern int am_sender;
-@@ -438,9 +439,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -505,9 +506,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  			file->flags |= FLAG_TIME_FAILED;
  	}