The patches for 3.0.0.

[rsync/rsync-patches.git] / backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 679c7cc..ee24be9 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -118,7 +118,7 @@ diff --git a/generator.c b/generator.c
  
 @@ -138,10 +141,15 @@ enum delret {
  /* Forward declaration for delete_item(). */
- static enum delret delete_dir_contents(char *fname, int flags);
+ static enum delret delete_dir_contents(char *fname, uint16 flags);
  
 +
 +/* Function now compares both backup_suffix and backup_suffix_dels. */
@@ -133,7 +133,7 @@ diff --git a/generator.c b/generator.c
  }
  
  /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
-@@ -180,9 +188,9 @@ static enum delret delete_item(char *fbuf, int mode, int flags)
+@@ -189,9 +197,9 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
        if (S_ISDIR(mode)) {
                what = "rmdir";
                ok = do_rmdir(fbuf) == 0;