Fixed failing hunks.

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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index edc65dc..3fde3d2 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -13,7 +13,7 @@ suffix.
 
 Marc St-Onge
 
---- orig/backup.c      2005-02-22 02:10:16
+--- orig/backup.c      2005-02-22 01:57:58
 +++ backup.c   2005-02-22 02:11:15
 @@ -22,11 +22,17 @@
  
@@ -106,22 +106,23 @@ Marc St-Onge
 +      deleting = 0;
 +      return ret;
 +}
---- orig/generator.c   2005-02-27 18:24:42
-+++ generator.c        2005-02-26 19:31:06
-@@ -82,16 +82,23 @@ extern dev_t filesystem_dev;
+--- orig/generator.c   2005-03-09 23:46:28
++++ generator.c        2005-03-11 11:22:38
+@@ -83,6 +83,9 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
 +extern char *backup_dir_dels;
 +extern char *backup_suffix_dels;
 +extern int backup_suffix_dels_len;
- 
+ extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
+@@ -91,10 +94,14 @@ int allowed_lull = 0;
  static int deletion_count = 0; /* used to implement --max-delete */
  
  
-+/* Function now checks if file matches backup- or delete-suffix patterns. */
++/* Function now compares both backup_suffix and backup_suffix_dels. */
  static int is_backup_file(char *fn)
  {
        int k = strlen(fn) - backup_suffix_len;
@@ -133,10 +134,10 @@ Marc St-Onge
  }
  
  
-@@ -109,8 +116,8 @@ static int delete_item(char *fname, int 
-               return -1;
- 
+@@ -111,8 +118,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)))
@@ -144,8 +145,8 @@ Marc St-Onge
                else
                        ok = robust_unlink(fname) == 0;
                if (ok) {
-@@ -131,9 +138,9 @@ static int delete_item(char *fname, int 
-       if (dry_run && zap_dir) {
+@@ -135,9 +142,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)
@@ -156,7 +157,7 @@ Marc St-Onge
        else
                ok = do_rmdir(fname) == 0;
        if (ok) {
---- orig/options.c     2005-03-01 01:22:59
+--- orig/options.c     2005-03-09 18:53:53
 +++ options.c  2005-03-01 01:25:39
 @@ -127,10 +127,14 @@ int no_detach
  int write_batch = 0;