Fixed failing hunks.

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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 8ba9754..35d6327 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -122,7 +122,7 @@ To use this patch, run these commands for a successful build:
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -110,10 +113,14 @@ enum delret {
+@@ -114,10 +117,14 @@ enum delret {
  static enum delret delete_dir_contents(char *fname, int flags);
  
  
@@ -138,7 +138,7 @@ To use this patch, run these commands for a successful build:
  }
  
  /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
-@@ -147,9 +154,9 @@ static enum delret delete_item(char *fna
+@@ -153,9 +160,9 @@ static enum delret delete_item(char *fna
        if (S_ISDIR(mode)) {
                what = "rmdir";
                ok = do_rmdir(fname) == 0;
@@ -205,9 +205,9 @@ To use this patch, run these commands for a successful build:
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;
-@@ -1253,6 +1265,14 @@ int parse_arguments(int *argc, const cha
-                               return 0;
-                       }
+@@ -1249,6 +1261,14 @@ int parse_arguments(int *argc, const cha
+                       if (check_filter(elp, backup_dir, 1) < 0)
+                               goto options_rejected;
                }
 +              /* Clean backup_dir_dels same as for backup_dir */
 +              if (backup_dir_dels) {
@@ -220,7 +220,7 @@ To use this patch, run these commands for a successful build:
        }
  
        if (!backup_suffix)
-@@ -1264,6 +1284,16 @@ int parse_arguments(int *argc, const cha
+@@ -1260,6 +1280,16 @@ int parse_arguments(int *argc, const cha
                        backup_suffix);
                return 0;
        }
@@ -237,7 +237,7 @@ To use this patch, run these commands for a successful build:
        if (backup_dir) {
                backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
                backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
-@@ -1287,6 +1317,31 @@ int parse_arguments(int *argc, const cha
+@@ -1283,6 +1313,31 @@ int parse_arguments(int *argc, const cha
                        "P *%s", backup_suffix);
                parse_rule(&filter_list, backup_dir_buf, 0, 0);
        }
@@ -269,7 +269,7 @@ To use this patch, run these commands for a successful build:
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
-@@ -1646,6 +1701,10 @@ void server_options(char **args,int *arg
+@@ -1647,6 +1702,10 @@ void server_options(char **args,int *arg
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -280,7 +280,7 @@ To use this patch, run these commands for a successful build:
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1654,7 +1713,13 @@ void server_options(char **args,int *arg
+@@ -1655,7 +1714,13 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }