The patches for 3.0.4pre2.

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 14db3e9..97d7f1d 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -27,7 +27,7 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -70,6 +70,7 @@ extern int need_unsorted_flist;
+@@ -71,6 +71,7 @@ extern int sender_symlink_iconv;
  extern int unsort_ndx;
  extern struct stats stats;
  extern char *filesfrom_host;
@@ -35,7 +35,7 @@ diff --git a/flist.c b/flist.c
  
  extern char curr_dir[MAXPATHLEN];
  
-@@ -834,7 +835,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -844,7 +845,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
                extra_len += EXTRA_LEN;
  #endif
  
@@ -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. */
-@@ -2028,6 +2046,11 @@ void server_options(char **args, int *argc_p)
+@@ -2036,6 +2054,11 @@ void server_options(char **args, int *argc_p)
        } else if (inplace)
                args[ac++] = "--inplace";
  
@@ -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
-@@ -48,6 +48,7 @@ extern int inplace;
- extern int flist_eof;
- extern int keep_dirlinks;
+@@ -50,6 +50,7 @@ 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
-@@ -575,8 +576,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -588,8 +589,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
-@@ -828,6 +828,14 @@ struct stats {
+@@ -830,6 +830,14 @@ struct stats {
        int num_transferred_files;
  };