The patches for 3.0.4pre1.

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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 0b8d322..dc0d9f1 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -157,7 +157,7 @@ diff --git a/options.c b/options.c
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
-+int backup_dir_dels_len = 0;  
++int backup_dir_dels_len = 0;
  int backup_suffix_len;
 +int backup_suffix_dels_len;
  unsigned int backup_dir_remainder;
@@ -236,7 +236,7 @@ diff --git a/options.c b/options.c
 +      if (strchr(backup_suffix_dels, '/') != NULL) {
 +              snprintf(err_buf, sizeof err_buf,
 +                      "--suffix-dels cannot contain slashes: %s\n",
-+                      backup_suffix_dels);    
++                      backup_suffix_dels);
 +              return 0;
 +      }
        if (backup_dir) {
@@ -277,7 +277,7 @@ diff --git a/options.c b/options.c
  
        if (make_backups && !backup_dir) {
                omit_dir_times = 0; /* Implied, so avoid -O to sender. */
-@@ -1901,6 +1963,10 @@ void server_options(char **args, int *argc_p)
+@@ -1907,6 +1969,10 @@ void server_options(char **args, int *argc_p)
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -288,7 +288,7 @@ diff --git a/options.c b/options.c
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1909,7 +1975,14 @@ void server_options(char **args, int *argc_p)
+@@ -1915,7 +1981,14 @@ void server_options(char **args, int *argc_p)
                        goto oom;
                args[ac++] = arg;
        }