Updated patches to work with the current trunk.

[rsync/rsync-patches.git] / checksum-updating.diff

diff --git a/checksum-updating.diff b/checksum-updating.diff
index afcf00a..a68de7b 100644 (file)
--- a/checksum-updating.diff
+++ b/checksum-updating.diff
@@ -17,18 +17,19 @@ TODO:
 
  - Fix the code that removes .rsyncsums files when a dir becomes empty.
 
 
  - Fix the code that removes .rsyncsums files when a dir becomes empty.
 

+based-on: patch/checksum-reading

 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c

-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
+ #include "inums.h"

  #include "io.h"
  
  #include "io.h"
  

- extern int verbose;

 +extern int dry_run;
  extern int am_root;
  extern int am_server;
  extern int am_daemon;
 +extern int dry_run;
  extern int am_root;
  extern int am_server;
  extern int am_daemon;

-@@ -94,6 +95,9 @@ extern iconv_t ic_send, ic_recv;
+@@ -106,6 +107,9 @@ extern iconv_t ic_send, ic_recv;

  
  #define PTR_SIZE (sizeof (struct file_struct *))
  
  
  #define PTR_SIZE (sizeof (struct file_struct *))
  


@@ -38,9 +39,9 @@ diff --git a/flist.c b/flist.c
  int io_error;
  int checksum_len;
  dev_t filesystem_dev; /* used to implement -x */
  int io_error;
  int checksum_len;
  dev_t filesystem_dev; /* used to implement -x */

-@@ -133,8 +137,13 @@ static char empty_sum[MAX_DIGEST_LEN];
+@@ -145,8 +149,13 @@ static char tmp_sum[MAX_DIGEST_LEN];
+ static char empty_sum[MAX_DIGEST_LEN];

  static int flist_count_offset; /* for --delete --progress */
  static int flist_count_offset; /* for --delete --progress */

- static int dir_count = 0;

  
 +#define REGULAR_SKIPPED(flist) ((flist)->to_redo)
 +
  
 +#define REGULAR_SKIPPED(flist) ((flist)->to_redo)
 +


@@ -52,7 +53,7 @@ diff --git a/flist.c b/flist.c
  } *csum_cache = NULL;
  
  static void flist_sort_and_clean(struct file_list *flist, int flags);
  } *csum_cache = NULL;
  
  static void flist_sort_and_clean(struct file_list *flist, int flags);

-@@ -351,7 +360,79 @@ static void flist_done_allocating(struct file_list *flist)
+@@ -364,7 +373,79 @@ static void flist_done_allocating(struct file_list *flist)

                flist->pool_boundary = ptr;
  }
  
                flist->pool_boundary = ptr;
  }
  


@@ -133,7 +134,7 @@ diff --git a/flist.c b/flist.c
  {
        int slot, slots = am_sender ? 1 : basis_dir_cnt + 1;
  
  {
        int slot, slots = am_sender ? 1 : basis_dir_cnt + 1;
  

-@@ -365,6 +446,9 @@ void reset_checksum_cache()
+@@ -378,6 +459,9 @@ void reset_checksum_cache()

                struct file_list *flist = csum_cache[slot].flist;
  
                if (flist) {
                struct file_list *flist = csum_cache[slot].flist;
  
                if (flist) {


@@ -143,7 +144,7 @@ diff --git a/flist.c b/flist.c
                        /* Reset the pool memory and empty the file-list array. */
                        pool_free_old(flist->file_pool,
                                      pool_boundary(flist->file_pool, 0));
                        /* Reset the pool memory and empty the file-list array. */
                        pool_free_old(flist->file_pool,
                                      pool_boundary(flist->file_pool, 0));

-@@ -375,6 +459,10 @@ void reset_checksum_cache()
+@@ -388,6 +472,10 @@ void reset_checksum_cache()

                flist->low = 0;
                flist->high = -1;
                flist->next = NULL;
                flist->low = 0;
                flist->high = -1;
                flist->next = NULL;


@@ -154,7 +155,7 @@ diff --git a/flist.c b/flist.c
        }
  }
  
        }
  }
  

-@@ -382,7 +470,7 @@ void reset_checksum_cache()
+@@ -395,7 +483,7 @@ void reset_checksum_cache()

  static int add_checksum(struct file_list *flist, const char *dirname,
                        const char *basename, int basename_len, OFF_T file_length,
                        time_t mtime, uint32 ctime, uint32 inode,
  static int add_checksum(struct file_list *flist, const char *dirname,
                        const char *basename, int basename_len, OFF_T file_length,
                        time_t mtime, uint32 ctime, uint32 inode,


@@ -163,7 +164,7 @@ diff --git a/flist.c b/flist.c
  {
        struct file_struct *file;
        int alloc_len, extra_len;
  {
        struct file_struct *file;
        int alloc_len, extra_len;

-@@ -399,7 +487,7 @@ static int add_checksum(struct file_list *flist, const char *dirname,
+@@ -412,7 +500,7 @@ static int add_checksum(struct file_list *flist, const char *dirname,

        if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
                extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
  #endif
        if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
                extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
  #endif


@@ -172,7 +173,7 @@ diff --git a/flist.c b/flist.c
        bp = pool_alloc(flist->file_pool, alloc_len, "add_checksum");
  
        memset(bp, 0, extra_len + FILE_STRUCT_LEN);
        bp = pool_alloc(flist->file_pool, alloc_len, "add_checksum");
  
        memset(bp, 0, extra_len + FILE_STRUCT_LEN);

-@@ -408,7 +496,14 @@ static int add_checksum(struct file_list *flist, const char *dirname,
+@@ -421,7 +509,14 @@ static int add_checksum(struct file_list *flist, const char *dirname,

        bp += FILE_STRUCT_LEN;
  
        memcpy(bp, basename, basename_len);
        bp += FILE_STRUCT_LEN;
  
        memcpy(bp, basename, basename_len);


@@ -187,7 +188,7 @@ diff --git a/flist.c b/flist.c
        file->mode = S_IFREG;
        file->modtime = mtime;
        file->len32 = (uint32)file_length;
        file->mode = S_IFREG;
        file->modtime = mtime;
        file->len32 = (uint32)file_length;

-@@ -437,10 +532,11 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -450,10 +545,11 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam

        char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
        FILE *fp;
        char *cp;
        char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
        FILE *fp;
        char *cp;


@@ -200,7 +201,7 @@ diff --git a/flist.c b/flist.c
        int dlen = dirname ? strlcpy(fbuf, dirname, sizeof fbuf) : 0;
  
        if (dlen >= (int)(sizeof fbuf - 1 - RSYNCSUMS_LEN))
        int dlen = dirname ? strlcpy(fbuf, dirname, sizeof fbuf) : 0;
  
        if (dlen >= (int)(sizeof fbuf - 1 - RSYNCSUMS_LEN))

-@@ -461,7 +557,7 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -474,7 +570,7 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam

        while (fgets(line, sizeof line, fp)) {
                cp = line;
                if (protocol_version >= 30) {
        while (fgets(line, sizeof line, fp)) {
                cp = line;
                if (protocol_version >= 30) {


@@ -209,7 +210,7 @@ diff --git a/flist.c b/flist.c
                        if (*cp == '=')
                                while (*++cp == '=') {}
                        else
                        if (*cp == '=')
                                while (*++cp == '=') {}
                        else

-@@ -472,7 +568,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -485,7 +581,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam

                }
  
                if (*cp == '=') {
                }
  
                if (*cp == '=') {


@@ -225,7 +226,7 @@ diff --git a/flist.c b/flist.c
                } else {
                        for (i = 0; i < checksum_len*2; i++, cp++) {
                                int x;
                } else {
                        for (i = 0; i < checksum_len*2; i++, cp++) {
                                int x;

-@@ -490,13 +593,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -503,13 +606,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam

                                else
                                        sum[i/2] = x << 4;
                        }
                                else
                                        sum[i/2] = x << 4;
                        }


@@ -241,7 +242,7 @@ diff --git a/flist.c b/flist.c
                        if (*cp == '=')
                                while (*++cp == '=') {}
                        else
                        if (*cp == '=')
                                while (*++cp == '=') {}
                        else

-@@ -546,24 +650,112 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -559,24 +663,112 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam

                        continue;
  
                strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);
                        continue;
  
                strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);


@@ -356,7 +357,7 @@ diff --git a/flist.c b/flist.c
                read_checksums(slot, flist, file->dirname);
        }
  
                read_checksums(slot, flist, file->dirname);
        }
  

-@@ -575,12 +767,31 @@ void get_cached_checksum(int slot, const char *fname, struct file_struct *file,
+@@ -588,12 +780,31 @@ void get_cached_checksum(int slot, const char *fname, struct file_struct *file,

                 && (checksum_files & CSF_LAX
                  || (F_CTIME(fp) == (uint32)stp->st_ctime
                   && F_INODE(fp) == (uint32)stp->st_ino))) {
                 && (checksum_files & CSF_LAX
                  || (F_CTIME(fp) == (uint32)stp->st_ctime
                   && F_INODE(fp) == (uint32)stp->st_ino))) {


@@ -389,8 +390,8 @@ diff --git a/flist.c b/flist.c
  }
  
  /* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's
  }
  
  /* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's

-@@ -1364,6 +1575,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
-       if (excl_ret) {
+@@ -1488,6 +1699,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+       if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {

                if (ignore_perishable)
                        non_perishable_cnt++;
 +              if (S_ISREG(st.st_mode))
                if (ignore_perishable)
                        non_perishable_cnt++;
 +              if (S_ISREG(st.st_mode))


@@ -398,7 +399,7 @@ diff --git a/flist.c b/flist.c
                return NULL;
        }
  
                return NULL;
        }
  

-@@ -1410,13 +1623,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1534,13 +1747,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,

                        lastdir[len] = '\0';
                        lastdir_len = len;
                        if (checksum_files && am_sender && flist)
                        lastdir[len] = '\0';
                        lastdir_len = len;
                        if (checksum_files && am_sender && flist)


@@ -414,7 +415,7 @@ diff --git a/flist.c b/flist.c
                }
        }
        basename_len = strlen(basename) + 1; /* count the '\0' */
                }
        }
        basename_len = strlen(basename) + 1; /* count the '\0' */

-@@ -1498,7 +1711,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1646,7 +1859,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,

  
        if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
                if (flist && checksum_files)
  
        if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
                if (flist && checksum_files)


@@ -422,8 +423,8 @@ diff --git a/flist.c b/flist.c
 +                      get_cached_checksum(0, thisname, file, basename_len, &st, tmp_sum);
                else
                        file_checksum(thisname, st.st_size, tmp_sum);
 +                      get_cached_checksum(0, thisname, file, basename_len, &st, tmp_sum);
                else
                        file_checksum(thisname, st.st_size, tmp_sum);

-       }
-@@ -1824,6 +2037,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+               if (sender_keeps_checksum)
+@@ -2019,6 +2232,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,

  
        closedir(d);
  
  
        closedir(d);
  


@@ -433,28 +434,28 @@ diff --git a/flist.c b/flist.c
        if (f >= 0 && recurse && !divert_dirs) {
                int i, end = flist->used - 1;
                /* send_if_directory() bumps flist->used, so use "end". */
        if (f >= 0 && recurse && !divert_dirs) {
                int i, end = flist->used - 1;
                /* send_if_directory() bumps flist->used, so use "end". */

-@@ -2417,6 +2633,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
-               }
-       } else
-               flist_eof = 1;
-+      
+@@ -2652,6 +2868,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+                       rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
+       }
+ 

 +      if (checksum_files & CSF_UPDATE && flist_eof)
 +              reset_checksum_cache(0); /* writes any last updates */
 +      if (checksum_files & CSF_UPDATE && flist_eof)
 +              reset_checksum_cache(0); /* writes any last updates */

- 
++

        return flist;
  }
        return flist;
  }

+ 

 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c

-@@ -114,6 +114,7 @@ static int dir_tweaking;
+@@ -111,6 +111,7 @@ static int dir_tweaking;

  static int symlink_timeset_failed_flags;
  static int need_retouch_dir_times;
  static int need_retouch_dir_perms;
 +static int started_whole_dir, upcoming_whole_dir;
  static const char *solo_file = NULL;
  
  static int symlink_timeset_failed_flags;
  static int need_retouch_dir_times;
  static int need_retouch_dir_perms;
 +static int started_whole_dir, upcoming_whole_dir;
  static const char *solo_file = NULL;
  

- /* For calling delete_item() and delete_dir_contents(). */
-@@ -720,7 +721,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st, int slot
+ enum nonregtype {
+@@ -533,7 +534,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st, int slot

        if (always_checksum > 0 && S_ISREG(st->st_mode)) {
                char sum[MAX_DIGEST_LEN];
                if (checksum_files && slot >= 0)
        if (always_checksum > 0 && S_ISREG(st->st_mode)) {
                char sum[MAX_DIGEST_LEN];
                if (checksum_files && slot >= 0)


@@ -463,7 +464,7 @@ diff --git a/generator.c b/generator.c
                else
                        file_checksum(fn, st->st_size, sum);
                return memcmp(sum, F_SUM(file), checksum_len) == 0;
                else
                        file_checksum(fn, st->st_size, sum);
                return memcmp(sum, F_SUM(file), checksum_len) == 0;

-@@ -1353,7 +1354,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1184,7 +1185,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,

                                fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
                        }
                        if (checksum_files) {
                                fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
                        }
                        if (checksum_files) {


@@ -473,7 +474,7 @@ diff --git a/generator.c b/generator.c
                        }
                        need_new_dirscan = 0;
                }
                        }
                        need_new_dirscan = 0;
                }

-@@ -1498,6 +1500,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1342,6 +1344,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,

                        else
                                change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
                }
                        else
                                change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
                }


@@ -481,7 +482,7 @@ diff --git a/generator.c b/generator.c
                goto cleanup;
        }
  
                goto cleanup;
        }
  

-@@ -1790,6 +1793,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1615,6 +1618,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,

                        handle_partial_dir(partialptr, PDIR_DELETE);
                }
                set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
                        handle_partial_dir(partialptr, PDIR_DELETE);
                }
                set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);


@@ -490,7 +491,7 @@ diff --git a/generator.c b/generator.c
                if (itemizing)
                        itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
  #ifdef SUPPORT_HARD_LINKS
                if (itemizing)
                        itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
  #ifdef SUPPORT_HARD_LINKS

-@@ -2204,6 +2209,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2122,6 +2127,7 @@ void generate_files(int f_out, const char *local_name)

                                } else
                                        change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
                        }
                                } else
                                        change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
                        }


@@ -498,28 +499,28 @@ diff --git a/generator.c b/generator.c
                }
                for (i = cur_flist->low; i <= cur_flist->high; i++) {
                        struct file_struct *file = cur_flist->sorted[i];
                }
                for (i = cur_flist->low; i <= cur_flist->high; i++) {
                        struct file_struct *file = cur_flist->sorted[i];

-@@ -2284,6 +2290,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -2216,6 +2222,9 @@ void generate_files(int f_out, const char *local_name)

                        wait_for_receiver();
        }
  
 +      if (checksum_files)
 +              reset_checksum_cache(started_whole_dir);
 +
                        wait_for_receiver();
        }
  
 +      if (checksum_files)
 +              reset_checksum_cache(started_whole_dir);
 +

-       do_progress = save_do_progress;
-       if (delete_during == 2)
-               do_delayed_deletions(fbuf);
+       info_levels[INFO_FLIST] = save_info_flist;
+       info_levels[INFO_PROGRESS] = save_info_progress;
+ 

 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c

-@@ -50,6 +50,7 @@ extern int read_batch;
- extern int csum_length;
+@@ -52,6 +52,7 @@ extern int list_only;
+ extern int read_batch;

  extern int protect_args;
  extern int checksum_seed;
 +extern int checksum_files;
  extern int protocol_version;
  extern int remove_source_files;
  extern int preserve_hard_links;
  extern int protect_args;
  extern int checksum_seed;
 +extern int checksum_files;
  extern int protocol_version;
  extern int remove_source_files;
  extern int preserve_hard_links;

-@@ -205,6 +206,9 @@ static void got_flist_entry_status(enum festatus status, const char *buf)
+@@ -987,6 +988,9 @@ static void got_flist_entry_status(enum festatus status, int ndx)

                                flist_ndx_push(&hlink_list, ndx);
                                flist->in_progress++;
                        }
                                flist_ndx_push(&hlink_list, ndx);
                                flist->in_progress++;
                        }


@@ -532,7 +533,7 @@ diff --git a/io.c b/io.c
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c
 diff --git a/loadparm.c b/loadparm.c
 --- a/loadparm.c
 +++ b/loadparm.c

-@@ -300,6 +300,10 @@ static struct enum_list enum_csum_modes[] = {
+@@ -312,6 +312,10 @@ static struct enum_list enum_csum_modes[] = {

        { CSF_IGNORE_FILES, "none" },
        { CSF_LAX_MODE, "lax" },
        { CSF_STRICT_MODE, "strict" },
        { CSF_IGNORE_FILES, "none" },
        { CSF_LAX_MODE, "lax" },
        { CSF_STRICT_MODE, "strict" },


@@ -546,7 +547,7 @@ diff --git a/loadparm.c b/loadparm.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c

-@@ -1233,7 +1233,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1656,7 +1656,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)

  
                case OPT_SUMFILES:
                        arg = poptGetOptArg(pc);
  
                case OPT_SUMFILES:
                        arg = poptGetOptArg(pc);


@@ -566,15 +567,15 @@ diff --git a/options.c b/options.c
 diff --git a/receiver.c b/receiver.c
 --- a/receiver.c
 +++ b/receiver.c
 diff --git a/receiver.c b/receiver.c
 --- a/receiver.c
 +++ b/receiver.c

-@@ -47,6 +47,7 @@ extern int append_mode;
- extern int sparse_files;
+@@ -47,6 +47,7 @@ extern int sparse_files;

  extern int keep_partial;
  extern int keep_partial;

+ extern int checksum_len;

  extern int checksum_seed;
 +extern int checksum_files;
  extern int inplace;
  extern int delay_updates;
  extern mode_t orig_umask;
  extern int checksum_seed;
 +extern int checksum_files;
  extern int inplace;
  extern int delay_updates;
  extern mode_t orig_umask;

-@@ -339,7 +340,7 @@ static void handle_delayed_updates(char *local_name)
+@@ -376,7 +377,7 @@ static void handle_delayed_updates(char *local_name)

                                        "rename failed for %s (from %s)",
                                        full_fname(fname), partialptr);
                        } else {
                                        "rename failed for %s (from %s)",
                                        full_fname(fname), partialptr);
                        } else {


@@ -583,9 +584,9 @@ diff --git a/receiver.c b/receiver.c
                                 || (preserve_hard_links && F_IS_HLINKED(file)))
                                        send_msg_int(MSG_SUCCESS, ndx);
                                handle_partial_dir(partialptr, PDIR_DELETE);
                                 || (preserve_hard_links && F_IS_HLINKED(file)))
                                        send_msg_int(MSG_SUCCESS, ndx);
                                handle_partial_dir(partialptr, PDIR_DELETE);

-@@ -716,7 +717,7 @@ int recv_files(int f_in, char *local_name)
- 
-               switch (recv_ok) {
+@@ -829,7 +830,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+               case 2:
+                       break;

                case 1:
 -                      if (remove_source_files || inc_recurse
 +                      if (remove_source_files || inc_recurse || checksum_files & CSF_UPDATE
                case 1:
 -                      if (remove_source_files || inc_recurse
 +                      if (remove_source_files || inc_recurse || checksum_files & CSF_UPDATE


@@ -595,7 +596,7 @@ diff --git a/receiver.c b/receiver.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h

-@@ -870,6 +870,8 @@ typedef struct {
+@@ -929,6 +929,8 @@ typedef struct {

  
  #define CSF_ENABLE (1<<1)
  #define CSF_LAX (1<<2)
  
  #define CSF_ENABLE (1<<1)
  #define CSF_LAX (1<<2)


@@ -607,7 +608,7 @@ diff --git a/rsync.h b/rsync.h
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo

-@@ -544,9 +544,13 @@ computed just as it would be if bf(--sumfiles) was not specified.
+@@ -599,9 +599,13 @@ computed just as it would be if bf(--sumfiles) was not specified.

  
  The MODE value is either "lax", for relaxed checking (which compares size
  and mtime), "strict" (which also compares ctime and inode), or "none" to
  
  The MODE value is either "lax", for relaxed checking (which compares size
  and mtime), "strict" (which also compares ctime and inode), or "none" to


@@ -627,7 +628,7 @@ diff --git a/rsync.yo b/rsync.yo
 diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 --- a/rsyncd.conf.yo
 +++ b/rsyncd.conf.yo
 diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 --- a/rsyncd.conf.yo
 +++ b/rsyncd.conf.yo

-@@ -284,13 +284,15 @@ The default is tt(/var/run/rsyncd.lock).
+@@ -315,13 +315,15 @@ The default is tt(/var/run/rsyncd.lock).

  dit(bf(checksum files)) This parameter tells rsync to make use of any cached
  checksum information it finds in per-directory .rsyncsums files when the
  current transfer is using the bf(--checksum) option.  The value can be set
  dit(bf(checksum files)) This parameter tells rsync to make use of any cached
  checksum information it finds in per-directory .rsyncsums files when the
  current transfer is using the bf(--checksum) option.  The value can be set