X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/4c107044a94d027e9ba894d31577f427c10402ae..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/log-checksum.diff

diff --git a/log-checksum.diff b/log-checksum.diff
index bbdf55a..627d13d 100644
--- a/log-checksum.diff
+++ b/log-checksum.diff
@@ -46,7 +46,7 @@ diff --git a/flist.c b/flist.c
  	if (am_sender)
  		F_PATHNAME(file) = pathname;
  	else if (!pool)
-@@ -1319,6 +1323,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1300,6 +1304,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
  		return NULL;
  	}
  
@@ -72,7 +72,7 @@ diff --git a/log.c b/log.c
  extern int gid_ndx;
 @@ -57,6 +59,7 @@ extern iconv_t ic_send, ic_recv;
  extern char curr_dir[];
- extern char *module_dir;
+ extern char *full_module_path;
  extern unsigned int module_dirlen;
 +extern char sender_file_sum[MAX_DIGEST_LEN];
  
@@ -210,7 +210,7 @@ diff --git a/match.c b/match.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -1524,7 +1524,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1525,7 +1525,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  		else if (log_format_has(stdout_format, 'i'))
  			stdout_format_has_i = itemize_changes | 1;
  		if (!log_format_has(stdout_format, 'b')
@@ -239,7 +239,7 @@ diff --git a/receiver.c b/receiver.c
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct filter_list_struct daemon_filter_list;
  
-@@ -165,10 +167,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -166,10 +168,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  			const char *fname, int fd, OFF_T total_size)
  {
  	static char file_sum1[MAX_DIGEST_LEN];
@@ -251,7 +251,7 @@ diff --git a/receiver.c b/receiver.c
  	OFF_T offset = 0;
  	OFF_T offset2;
  	char *data;
-@@ -298,15 +299,16 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -302,15 +303,16 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  		exit_cleanup(RERR_FILEIO);
  	}