Updated patches to work with the current trunk.

[rsync/rsync-patches.git] / omit-dir-changes.diff

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index a7db145..92dc4c3 100644 (file)
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -7,8 +7,8 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
 diff --git a/generator.c b/generator.c
-index 12007a1..29c9297 100644
 --- a/generator.c
 +++ b/generator.c
 @@ -44,6 +44,7 @@ extern int preserve_hard_links;
@@ -26,7 +26,7 @@ index 12007a1..29c9297 100644
 +              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 @@ index 12007a1..29c9297 100644
                        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;
@@ -52,7 +52,6 @@ index 12007a1..29c9297 100644
                                               dflt_perms, statret == 0);
                }
 diff --git a/options.c b/options.c
-index e7c6c61..03588fd 100644
 --- a/options.c
 +++ b/options.c
 @@ -59,6 +59,7 @@ int preserve_specials = 0;
@@ -63,7 +62,7 @@ index e7c6c61..03588fd 100644
  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");
@@ -71,7 +70,7 @@ index e7c6c61..03588fd 100644
    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 },
@@ -79,8 +78,8 @@ index e7c6c61..03588fd 100644
    {"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 },
-@@ -2020,6 +2023,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
-               parse_rule(&filter_list, backup_dir_buf, 0, 0);
+@@ -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);
        }
  
 +      if (omit_dir_changes)
@@ -88,7 +87,7 @@ index e7c6c61..03588fd 100644
        if (make_backups && !backup_dir) {
                omit_dir_times = 0; /* Implied, so avoid -O to sender. */
                if (preserve_times > 1)
-@@ -2263,6 +2268,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';
@@ -98,7 +97,6 @@ index e7c6c61..03588fd 100644
                if (copy_links)
                        argstr[x++] = 'L';
 diff --git a/rsync.c b/rsync.c
-index 2c026a2..caf3204 100644
 --- a/rsync.c
 +++ b/rsync.c
 @@ -33,6 +33,7 @@ extern int preserve_xattrs;
@@ -109,7 +107,7 @@ index 2c026a2..caf3204 100644
  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;
        }
  
@@ -124,7 +122,6 @@ index 2c026a2..caf3204 100644
        if (S_ISLNK(sxp->st.st_mode)) {
                ;
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..9aef20a 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -356,6 +356,7 @@ to the detailed description below for a complete description.  verb(
@@ -135,7 +132,7 @@ index 941f7a5..9aef20a 100644
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
-@@ -1071,6 +1072,10 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
+@@ -1078,6 +1079,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).