One more tweak to the code in the backup.c file.

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 4eca0faa2568c8bd5d49df96ea487df3099f4067..2c8e7ca66caa10f57e187dcf47df8d638d9520a7 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
 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;
 @@ -22,11 +22,17 @@
  
  extern int verbose;


@@ -92,27 +92,20 @@ Marc St-Onge
                return 0;
  
  #ifdef HAVE_MKNOD
                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)
 +{
 +
 +/* backup switch routine called only when backing-up deleted file */
 +int safe_delete(char *fname)
 +{

++      int ret;

 +      deleting = 1;
 +      deleting = 1;

-+      return make_backup(fname);
- }
++      ret = make_backup(fname);
++      deleting = 0;
++      return ret;
++}

 --- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-09-22 02:25:03
 @@ -113,10 +113,14 @@ int no_detach = 0;
 --- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-09-22 02:25:03
 @@ -113,10 +113,14 @@ int no_detach = 0;