Fixed a failing hunk.

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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 4eca0fa..0ad9606 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -15,7 +15,7 @@ suffix.
 Marc St-Onge
 
 --- orig/backup.c      2004-09-20 19:50:13
-+++ backup.c   2004-09-22 02:18:49
++++ backup.c   2004-09-22 02:36:06
 @@ -22,11 +22,17 @@
  
  extern int verbose;
@@ -92,28 +92,21 @@ Marc St-Onge
                return 0;
  
  #ifdef HAVE_MKNOD
-@@ -262,7 +289,18 @@ static int keep_backup(char *fname)
- /* main backup switch routine */
- int make_backup(char *fname)
- {
-+      int ret;
-       if (backup_dir)
--              return keep_backup(fname);
--      return make_simple_backup(fname);
-+              ret = keep_backup(fname);
-+      else
-+              ret = make_simple_backup(fname);
-+      deleting = 0;   /* Always restore the default backup process. */
-+      return ret;
-+}
+@@ -266,3 +293,13 @@ int make_backup(char *fname)
+               return keep_backup(fname);
+       return make_simple_backup(fname);
+ }
 +
 +/* backup switch routine called only when backing-up deleted file */
 +int safe_delete(char *fname)
 +{
++      int ret;
 +      deleting = 1;
-+      return make_backup(fname);
- }
---- orig/options.c     2004-09-20 05:10:48
++      ret = make_backup(fname);
++      deleting = 0;
++      return ret;
++}
+--- orig/options.c     2004-09-23 17:42:07
 +++ options.c  2004-09-22 02:25:03
 @@ -113,10 +113,14 @@ int no_detach = 0;
  int write_batch = 0;
@@ -237,7 +230,7 @@ Marc St-Onge
  
        if (do_progress && !verbose)
                verbose = 1;
-@@ -1005,6 +1058,10 @@ void server_options(char **args,int *arg
+@@ -1009,6 +1062,10 @@ void server_options(char **args,int *arg
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -248,7 +241,7 @@ Marc St-Onge
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1013,7 +1070,13 @@ void server_options(char **args,int *arg
+@@ -1017,7 +1074,13 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }