Fixed patch fuzz.

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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 55194ab..dd0b5b9 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -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-05 00:25:24
++++ generator.c        2005-03-05 00:26:54
+@@ -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,7 +134,7 @@ Marc St-Onge
  }
  
  
-@@ -109,8 +116,8 @@ static int delete_item(char *fname, int 
+@@ -112,8 +119,8 @@ static int delete_item(char *fname, int 
                return -1;
  
        if (!S_ISDIR(mode)) {
@@ -144,7 +145,7 @@ Marc St-Onge
                else
                        ok = robust_unlink(fname) == 0;
                if (ok) {
-@@ -131,9 +138,9 @@ static int delete_item(char *fname, int 
+@@ -134,9 +141,9 @@ static int delete_item(char *fname, int 
        if (dry_run && zap_dir) {
                ok = 0;
                errno = ENOTEMPTY;
@@ -156,8 +157,8 @@ Marc St-Onge
        else
                ok = do_rmdir(fname) == 0;
        if (ok) {
---- orig/options.c     2005-02-25 18:44:31
-+++ options.c  2005-02-21 11:02:45
+--- orig/options.c     2005-03-02 09:52:06
++++ options.c  2005-03-01 01:25:39
 @@ -127,10 +127,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
@@ -214,23 +215,25 @@ Marc St-Onge
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
 +              if (backup_dir_dels)                                                    
 +                      backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0);
-               if (files_from)
-                       files_from = sanitize_path(NULL, files_from, NULL, 0);
        }
-@@ -1036,6 +1048,12 @@ int parse_arguments(int *argc, const cha
-                       if (check_filter(elp, backup_dir, 1) < 0)
-                               goto options_rejected;
+       if (server_filter_list.head && !am_sender) {
+               struct filter_list_struct *elp = &server_filter_list;
+@@ -1038,6 +1050,14 @@ int parse_arguments(int *argc, const cha
+                               return 0;
+                       }
                }
 +              /* Clean backup_dir_dels same as for backup_dir */
 +              if (backup_dir_dels) {
++                      if (!*backup_dir_dels)
++                              goto options_rejected;
 +                      clean_fname(backup_dir_dels, 1);
 +                      if (check_filter(elp, backup_dir_dels, 1) < 0)
 +                              goto options_rejected;
 +              }
        }
-       if (server_filter_list.head && files_from) {
-               if (!*files_from)
-@@ -1058,6 +1076,16 @@ int parse_arguments(int *argc, const cha
+ 
+       if (!backup_suffix)
+@@ -1049,6 +1069,16 @@ int parse_arguments(int *argc, const cha
                        backup_suffix);
                return 0;
        }
@@ -247,7 +250,7 @@ Marc St-Onge
        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;
-@@ -1079,6 +1107,31 @@ int parse_arguments(int *argc, const cha
+@@ -1070,6 +1100,31 @@ int parse_arguments(int *argc, const cha
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
        }
@@ -279,7 +282,7 @@ Marc St-Onge
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
-@@ -1346,6 +1399,10 @@ void server_options(char **args,int *arg
+@@ -1348,6 +1403,10 @@ void server_options(char **args,int *arg
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -290,7 +293,7 @@ Marc St-Onge
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1354,7 +1411,13 @@ void server_options(char **args,int *arg
+@@ -1356,7 +1415,13 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }