The patches for 3.0.3pre3.

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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 51d8489..0b8d322 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -79,7 +79,7 @@ diff --git a/backup.c b/backup.c
        stat_x sx;
  
        while (*fullpath == '.' && fullpath[1] == '/') {
-@@ -211,7 +235,8 @@ static int keep_backup(const char *fname)
+@@ -221,7 +245,8 @@ static int keep_backup(const char *fname)
        if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
                return 1; /* the file could have disappeared */
  
@@ -89,7 +89,7 @@ diff --git a/backup.c b/backup.c
                unmake_file(file);
                return 0;
        }
-@@ -322,7 +347,17 @@ static int keep_backup(const char *fname)
+@@ -356,7 +381,17 @@ static int keep_backup(const char *fname)
  /* main backup switch routine */
  int make_backup(const char *fname)
  {
@@ -215,7 +215,7 @@ diff --git a/options.c b/options.c
 +                      if (!*backup_dir_dels)
 +                              goto options_rejected;
 +                      clean_fname(backup_dir_dels, 1);
-+                      if (check_filter(elp, backup_dir_dels, 1) < 0)
++                      if (check_filter(elp, FLOG, backup_dir_dels, 1) < 0)
 +                              goto options_rejected;
 +              }
        }