patch for combining detect-renamed and fileflags patches (fwd)

[Dmitry Morozovsky]

Dear collegaues,

please evaluate the patch attached, which allow to use both --detect-renamed 
and --fileflags extra features.

This is meta-patch which sould be applied to detect-renamed. fileflags patch 
should be applied first, following by the modified detect-renamed patch.

It is included in current FreeBSD port, but it seems it would be much more 
useful to be supported by samba maintainers.

Thanks!

-- 
Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer:                                 marck at FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck at rinet.ru ***
------------------------------------------------------------------------
-------------- next part --------------
--- detect-renamed.diff.orig	2013-09-29 07:02:08.000000000 +0400
+++ detect-renamed.diff	2013-10-24 18:42:22.000000000 +0400
@@ -42,15 +42,15 @@
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -43,6 +43,7 @@ extern int checksum_seed;
+@@ -39,6 +39,7 @@
+ extern int fuzzy_basis;
+ extern int read_batch;
+ extern int delay_updates;
++extern int detect_renamed;
+ extern int checksum_seed;
  extern int basis_dir_cnt;
  extern int prune_empty_dirs;
- extern int protocol_version;
-+extern int detect_renamed;
- extern int protect_args;
- extern int preserve_uid;
- extern int preserve_gid;
-@@ -123,6 +124,7 @@ void set_allow_inc_recurse(void)
+@@ -125,6 +126,7 @@
  		allow_inc_recurse = 0;
  	else if (!am_sender
  	 && (delete_before || delete_after
@@ -61,15 +61,15 @@
 diff --git a/delete.c b/delete.c
 --- a/delete.c
 +++ b/delete.c
-@@ -25,6 +25,7 @@
+@@ -23,6 +23,7 @@
+ #include "rsync.h"
+ 
  extern int am_root;
++extern int detect_renamed;
  extern int make_backups;
  extern int max_delete;
-+extern int detect_renamed;
- extern char *backup_dir;
- extern char *backup_suffix;
- extern int backup_suffix_len;
-@@ -44,6 +45,8 @@ static inline int is_backup_file(char *fn)
+ extern int force_change;
+@@ -45,6 +46,8 @@
   * its contents, otherwise just checks for content.  Returns DR_SUCCESS or
   * DR_NOT_EMPTY.  Note that fname must point to a MAXPATHLEN buffer!  (The
   * buffer is used for recursion, but returned unchanged.)
@@ -786,13 +786,13 @@
 @@ -353,7 +354,7 @@ void set_blocking(int fd);
  int fd_pair(int fd[2]);
  void print_child_argv(const char *prefix, char **cmd);
- int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode);
+ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode, uint32 fileflags);
 -int make_path(char *fname, int flags);
 +int make_path(char *fname, mode_t mode, int flags);
  int full_write(int desc, const char *ptr, size_t len);
  int copy_file(const char *source, const char *dest, int ofd, mode_t mode);
  int robust_unlink(const char *fname);
-@@ -373,6 +374,8 @@ char *sanitize_path(char *dest, const ch
+@@ -376,6 +377,8 @@
  		    int flags);
  int change_dir(const char *dir, int set_path_only);
  char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr);