Fixed a failing hunk.

diff --git a/atimes.diff b/atimes.diff
index 2bd9c8a..14bf56b 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -137,8 +137,8 @@ TODO:  need to fix this to handle 64-bit time_t values!
 +              F_ATIME(file) = (time_t)atime;
  #ifdef ICONV_OPTION
        if (ic_ndx)
-               F_NDX(file) = flist->count + flist->ndx_start;
-@@ -1182,6 +1208,8 @@ struct file_struct *make_file(const char
+               F_NDX(file) = flist->used + flist->ndx_start;
+@@ -1181,6 +1207,8 @@ struct file_struct *make_file(const char
                F_OWNER(file) = st.st_uid;
        if (gid_ndx)
                F_GROUP(file) = st.st_gid;
@@ -157,7 +157,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  extern int omit_dir_times;
  extern int uid_ndx;
  extern int gid_ndx;
-@@ -563,6 +564,9 @@ void itemize(const char *fnamecmp, struc
+@@ -564,6 +565,9 @@ void itemize(const char *fnamecmp, struc
                  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
                 || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
                        iflags |= ITEM_REPORT_TIME;
@@ -167,7 +167,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
                if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
                        iflags |= ITEM_REPORT_PERMS;
                if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
-@@ -880,6 +884,8 @@ static int try_dests_reg(struct file_str
+@@ -881,6 +885,8 @@ static int try_dests_reg(struct file_str
                if (link_dest) {
                        if (!hard_link_one(file, fname, cmpbuf, 1))
                                goto try_a_copy;
@@ -176,7 +176,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
                        if (preserve_hard_links && F_IS_HLINKED(file))
                                finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
                        if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
-@@ -1749,7 +1755,7 @@ static void touch_up_dirs(struct file_li
+@@ -1766,7 +1772,7 @@ static void touch_up_dirs(struct file_li
                if (!(file->mode & S_IWUSR))
                        do_chmod(fname, file->mode);
                if (need_retouch_dir_times)
@@ -207,14 +207,10 @@ TODO:  need to fix this to handle 64-bit time_t values!
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -335,8 +336,9 @@ void usage(enum logcode F)
-   rprintf(F,"     --devices               preserve device files (super-user only)\n");
-   rprintf(F,"     --specials              preserve special files\n");
+@@ -337,6 +338,7 @@ void usage(enum logcode F)
    rprintf(F," -D                          same as --devices --specials\n");
--  rprintf(F," -t, --times                 preserve times\n");
--  rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
-+  rprintf(F," -t, --times                 preserve modify times\n");
-+  rprintf(F," -O, --omit-dir-times        omit directories when preserving modify times\n");
+   rprintf(F," -t, --times                 preserve modification times\n");
+   rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
 +  rprintf(F," -U, --atimes                preserve access (last-used) times\n");
    rprintf(F,"     --super                 receiver attempts super-user activities\n");
  #ifdef SUPPORT_XATTRS
@@ -248,7 +244,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  extern int preserve_times;
  extern int omit_dir_times;
  extern int am_root;
-@@ -275,6 +276,7 @@ int set_file_attrs(const char *fname, st
+@@ -274,6 +275,7 @@ int set_file_attrs(const char *fname, st
        int updated = 0;
        statx sx2;
        int change_uid, change_gid;
@@ -256,7 +252,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
        mode_t new_mode = file->mode;
  
        if (!sxp) {
-@@ -312,18 +314,36 @@ int set_file_attrs(const char *fname, st
+@@ -311,18 +313,36 @@ int set_file_attrs(const char *fname, st
                set_stat_xattr(fname, file);
  #endif
  
@@ -322,7 +318,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  extern int acls_ndx;
  extern int xattrs_ndx;
  
-@@ -616,6 +619,7 @@ extern int xattrs_ndx;
+@@ -619,6 +622,7 @@ extern int xattrs_ndx;
  /* When the associated option is on, all entries will have these present: */
  #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
  #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
@@ -332,14 +328,10 @@ TODO:  need to fix this to handle 64-bit time_t values!
  #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -336,8 +336,9 @@ to the detailed description below for a 
-      --devices               preserve device files (super-user only)
-      --specials              preserve special files
+@@ -338,6 +338,7 @@ to the detailed description below for a 
   -D                          same as --devices --specials
-- -t, --times                 preserve times
-- -O, --omit-dir-times        omit directories when preserving times
-+ -t, --times                 preserve modify times
-+ -O, --omit-dir-times        omit directories when preserving mod-times
+  -t, --times                 preserve modification times
+  -O, --omit-dir-times        omit directories from --times
 + -U, --atimes                preserve access (use) times
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
@@ -357,16 +349,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  dit(bf(--super)) This tells the receiving side to attempt super-user
  activities even if the receiving rsync wasn't run by the super-user.  These
  activities include: preserving users via the bf(--owner) option, preserving
-@@ -1530,7 +1537,7 @@ quote(itemization(
-   by the file transfer.
-   it() A bf(t) means the modification time is different and is being updated
-   to the sender's value (requires bf(--times)).  An alternate value of bf(T)
--  means that the time will be set to the transfer time, which happens
-+  means that the modify time will be set to the transfer time, which happens
-   anytime a symlink is transferred, or when a file or device is transferred
-   without bf(--times).
-   it() A bf(p) means the permissions are different and are being updated to
-@@ -1539,8 +1546,10 @@ quote(itemization(
+@@ -1546,8 +1553,10 @@ quote(itemization(
    sender's value (requires bf(--owner) and super-user privileges).
    it() A bf(g) means the group is different and is being updated to the
    sender's value (requires bf(--group) and the authority to set the group).
@@ -387,7 +370,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  extern int write_batch;
 +extern unsigned int file_struct_len;
  extern struct stats stats;
- extern struct file_list *cur_flist, *first_flist;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
  
 --- old/testsuite/atimes.test
 +++ new/testsuite/atimes.test
@@ -441,7 +424,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  
 --- old/tls.c
 +++ new/tls.c
-@@ -98,6 +98,8 @@ static int stat_xattr(const char *fname,
+@@ -99,6 +99,8 @@ static int stat_xattr(const char *fname,
  
  #endif
  
@@ -450,7 +433,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  static void failed(char const *what, char const *where)
  {
        fprintf(stderr, PROGRAM ": %s %s: %s\n",
-@@ -105,12 +107,29 @@ static void failed(char const *what, cha
+@@ -106,12 +108,29 @@ static void failed(char const *what, cha
        exit(1);
  }
  
@@ -482,7 +465,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
        char linkbuf[4096];
  
        if (do_lstat(fname, &buf) < 0)
-@@ -147,19 +166,8 @@ static void list_file(const char *fname)
+@@ -148,19 +167,8 @@ static void list_file(const char *fname)
  
        permstring(permbuf, buf.st_mode);
  
@@ -504,7 +487,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  
        /* TODO: Perhaps escape special characters in fname? */
  
-@@ -170,13 +178,15 @@ static void list_file(const char *fname)
+@@ -171,13 +179,15 @@ static void list_file(const char *fname)
                    (long)minor(buf.st_rdev));
        } else /* NB: use double for size since it might not fit in a long. */
                printf("%12.0f", (double)buf.st_size);
@@ -522,7 +505,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  #ifdef SUPPORT_XATTRS
    {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
  #endif
-@@ -190,6 +200,7 @@ static void tls_usage(int ret)
+@@ -191,6 +201,7 @@ static void tls_usage(int ret)
    fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
    fprintf(F,"Trivial file listing program for portably checking rsync\n");
    fprintf(F,"\nOptions:\n");

diff --git a/omit-dir-changes.diff b/omit-dir-changes.diff
index cea3e74..2b0c41d 100644 (file)
--- a/omit-dir-changes.diff
+++ b/omit-dir-changes.diff
@@ -17,7 +17,7 @@ To use this patch, run these commands for a successful build:
  extern int uid_ndx;
  extern int gid_ndx;
  extern int delete_mode;
-@@ -555,6 +556,7 @@ void itemize(const char *fnamecmp, struc
+@@ -556,6 +557,7 @@ void itemize(const char *fnamecmp, struc
                int keep_time = !preserve_times ? 0
                    : S_ISDIR(file->mode) ? !omit_dir_times
                    : !S_ISLNK(file->mode);
@@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build:
  
                if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
                        iflags |= ITEM_REPORT_SIZE;
-@@ -565,10 +567,11 @@ void itemize(const char *fnamecmp, struc
+@@ -566,10 +568,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)) {
-@@ -1228,7 +1231,7 @@ static void recv_generator(char *fname, 
+@@ -1229,7 +1232,7 @@ static void recv_generator(char *fname, 
                                statret = -1;
                        new_root_dir = 0;
                }
@@ -61,9 +61,9 @@ To use this patch, run these commands for a successful build:
  int dry_run = 0;
 @@ -337,6 +338,7 @@ void usage(enum logcode F)
    rprintf(F," -D                          same as --devices --specials\n");
-   rprintf(F," -t, --times                 preserve times\n");
-   rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
-+  rprintf(F,"     --omit-dir-changes      omit directories when preserving any attributes\n");
+   rprintf(F," -t, --times                 preserve modification times\n");
+   rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
++  rprintf(F,"     --omit-dir-changes      omit directories 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");
@@ -104,7 +104,7 @@ To use this patch, run these commands for a successful build:
  extern int am_root;
  extern int am_server;
  extern int am_sender;
-@@ -326,9 +327,11 @@ int set_file_attrs(const char *fname, st
+@@ -325,9 +326,11 @@ int set_file_attrs(const char *fname, st
                        updated = 1;
        }