The patches for 3.0.4pre1.

[rsync/rsync-patches.git] / link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 9b511db..14db3e9 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -43,7 +43,7 @@ diff --git a/flist.c b/flist.c
 +      if ((always_checksum || link_by_hash_dir) && S_ISREG(mode))
                extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
  
-       if (file_length > 0xFFFFFFFFu && S_ISREG(mode))
+ #if SIZEOF_INT64 >= 8
 diff --git a/hashlink.c b/hashlink.c
 new file mode 100644
 --- /dev/null
@@ -443,7 +443,7 @@ diff --git a/options.c b/options.c
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -2023,6 +2041,11 @@ void server_options(char **args, int *argc_p)
+@@ -2028,6 +2046,11 @@ void server_options(char **args, int *argc_p)
        } else if (inplace)
                args[ac++] = "--inplace";
  
@@ -540,7 +540,7 @@ diff --git a/rsync.c b/rsync.c
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct chmod_mode_struct *daemon_chmod_modes;
  #ifdef ICONV_OPTION
-@@ -574,8 +575,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -575,8 +576,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
@@ -561,7 +561,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -824,6 +824,14 @@ struct stats {
+@@ -828,6 +828,14 @@ struct stats {
        int num_transferred_files;
  };