Fixed failing hunks.

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

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index 2b0c41d..bd4fca2 100644 (file)
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -9,23 +9,23 @@ To use this patch, run these commands for a successful build:
 
 --- old/generator.c
 +++ new/generator.c
-@@ -44,6 +44,7 @@ extern int preserve_hard_links;
+@@ -43,6 +43,7 @@ extern int preserve_specials;
+ extern int preserve_hard_links;
  extern int preserve_perms;
  extern int preserve_times;
- extern int omit_dir_times;
 +extern int omit_dir_changes;
  extern int uid_ndx;
  extern int gid_ndx;
  extern int delete_mode;
-@@ -556,6 +557,7 @@ void itemize(const char *fnamecmp, struc
+@@ -555,6 +556,7 @@ void itemize(const char *fnamecmp, struc
                int keep_time = !preserve_times ? 0
-                   : S_ISDIR(file->mode) ? !omit_dir_times
+                   : S_ISDIR(file->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;
-@@ -566,10 +568,11 @@ void itemize(const char *fnamecmp, struc
+@@ -565,10 +567,11 @@ void itemize(const char *fnamecmp, struc
                        iflags |= ITEM_REPORT_TIME;
                if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
                        iflags |= ITEM_REPORT_PERMS;
@@ -40,7 +40,7 @@ To use this patch, run these commands for a successful build:
                        iflags |= ITEM_REPORT_GROUP;
  #ifdef SUPPORT_ACLS
                if (preserve_acls && !S_ISLNK(file->mode)) {
-@@ -1229,7 +1232,7 @@ static void recv_generator(char *fname, 
+@@ -1235,7 +1238,7 @@ static void recv_generator(char *fname, 
                                statret = -1;
                        new_root_dir = 0;
                }
@@ -51,15 +51,15 @@ To use this patch, run these commands for a successful build:
                }
 --- old/options.c
 +++ new/options.c
-@@ -56,6 +56,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;
-@@ -337,6 +338,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 modification times\n");
    rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
@@ -67,27 +67,26 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --super                 receiver attempts super-user activities\n");
  #ifdef SUPPORT_XATTRS
    rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
-@@ -472,6 +474,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 },
+@@ -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 },
-@@ -1413,6 +1416,9 @@ int parse_arguments(int *argc, const cha
-                       "P *%s", backup_suffix);
+@@ -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;
  
-@@ -1642,6 +1648,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";
@@ -96,15 +95,15 @@ To use this patch, run these commands for a successful build:
                        argstr[x++] = 'L';
 --- old/rsync.c
 +++ new/rsync.c
-@@ -34,6 +34,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;
-@@ -325,9 +326,11 @@ int set_file_attrs(const char *fname, st
+@@ -324,9 +325,11 @@ int set_file_attrs(const char *fname, st
                        updated = 1;
        }