Fixed failing hunks.

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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 51b71cf..35d6327 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -122,8 +122,8 @@ 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;
  
-@@ -100,10 +103,14 @@ static int deletion_count = 0; /* used t
- #define DEL_TERSE             (1<<3)
+@@ -114,10 +117,14 @@ enum delret {
+ static enum delret delete_dir_contents(char *fname, int flags);
  
  
 +/* Function now compares both backup_suffix and backup_suffix_dels. */
@@ -137,30 +137,19 @@ To use this patch, run these commands for a successful build:
 +      return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
  }
  
- 
-@@ -124,8 +131,8 @@ static int delete_item(char *fname, int 
-       if (!S_ISDIR(mode)) {
-               if (max_delete && ++deletion_count > max_delete)
-                       return 0;
--              if (make_backups && (backup_dir || !is_backup_file(fname)))
--                      ok = make_backup(fname);
-+              if (make_backups && (backup_dir_dels || !is_backup_file(fname)))
-+                      ok = safe_delete(fname);
-               else
-                       ok = robust_unlink(fname) == 0;
-               if (ok) {
-@@ -147,9 +154,9 @@ static int delete_item(char *fname, int 
-           || (dry_run && zap_dir)) {
-               ok = 0;
-               errno = ENOTEMPTY;
--      } else if (make_backups && !backup_dir && !is_backup_file(fname)
-+      } else if (make_backups && !backup_dir_dels && !is_backup_file(fname)
-           && !(flags & DEL_FORCE_RECURSE))
+ /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
+@@ -153,9 +160,9 @@ static enum delret delete_item(char *fna
+       if (S_ISDIR(mode)) {
+               what = "rmdir";
+               ok = do_rmdir(fname) == 0;
+-      } else if (make_backups && (backup_dir || !is_backup_file(fname))) {
++      } else if (make_backups && (backup_dir_dels || !is_backup_file(fname))) {
+               what = "make_backup";
 -              ok = make_backup(fname);
 +              ok = safe_delete(fname);
-       else
-               ok = do_rmdir(fname) == 0;
-       if (ok) {
+       } else {
+               what = "unlink";
+               ok = robust_unlink(fname) == 0;
 --- old/options.c
 +++ new/options.c
 @@ -138,10 +138,14 @@ int no_detach
@@ -216,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) {
@@ -231,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;
        }
@@ -248,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);
        }
@@ -280,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;
        }
@@ -291,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;
        }