The patches for 3.0.4.

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 97d7f1d..5735941 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -532,15 +532,15 @@ diff --git a/receiver.c b/receiver.c
 diff --git a/rsync.c b/rsync.c
 --- a/rsync.c
 +++ b/rsync.c
-@@ -50,6 +50,7 @@ extern int keep_dirlinks;
+@@ -48,6 +48,7 @@ extern int inplace;
+ extern int flist_eof;
+ extern int keep_dirlinks;
  extern int make_backups;
- extern int delete_during;
- extern int check_for_io_err;
 +extern char *link_by_hash_dir;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct chmod_mode_struct *daemon_chmod_modes;
  #ifdef ICONV_OPTION
-@@ -588,8 +589,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);