Fixed patch fuzz.

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 29936dc..432309a 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -105,7 +105,7 @@ Marc St-Onge
 +      deleting = 0;
 +      return ret;
 +}
---- orig/flist.c       2005-02-09 02:37:15
+--- orig/flist.c       2005-02-13 21:17:16
 +++ flist.c    2005-01-30 10:11:42
 @@ -46,6 +46,8 @@ extern char curr_dir[MAXPATHLEN];
  extern unsigned int curr_dir_len;
@@ -124,7 +124,7 @@ Marc St-Onge
  extern int copy_links;
  extern int copy_unsafe_links;
  extern int protocol_version;
-@@ -1664,10 +1667,14 @@ char *f_name(struct file_struct *f)
+@@ -1709,10 +1712,14 @@ char *f_name(struct file_struct *f)
  }
  
  
@@ -140,9 +140,9 @@ Marc St-Onge
  }
  
  
-@@ -1755,11 +1762,12 @@ void delete_missing(struct file_list *fu
-               if ((j = flist_find(full_list, dir_list->files[i])) < 0
-                   || (S_ISDIR(mode) && !S_ISDIR(full_list->files[j]->mode))) {
+@@ -1799,11 +1806,12 @@ void delete_missing(struct file_list *fu
+               mode = dir_list->files[i]->mode;
+               if (flist_find(full_list, dir_list->files[i]) < 0) {
                        char *f = f_name(dir_list->files[i]);
 -                      if (make_backups && (backup_dir || !is_backup_file(f))
 +                      int backup_file = is_backup_file(f);
@@ -156,7 +156,7 @@ Marc St-Onge
                                                safe_fname(f));
                                }
                        } else if (S_ISDIR(mode))
---- orig/options.c     2005-02-11 18:21:45
+--- orig/options.c     2005-02-13 05:50:28
 +++ options.c  2005-01-28 19:17:35
 @@ -118,10 +118,14 @@ int no_detach = 0;
  int write_batch = 0;

diff --git a/date-only.diff b/date-only.diff
index e60c68d..18d5ed8 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,7 +15,7 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
---- orig/generator.c   2005-02-11 20:25:07
+--- orig/generator.c   2005-02-13 05:50:28
 +++ generator.c        2004-11-11 22:15:27
 @@ -43,6 +43,7 @@ extern int inplace;
  extern int make_backups;
@@ -34,7 +34,7 @@ Jeremy Bornstein
        if (st->st_size != file->length)
                return 0;
  
---- orig/options.c     2005-02-11 18:21:45
+--- orig/options.c     2005-02-13 05:50:28
 +++ options.c  2005-01-28 19:14:15
 @@ -87,6 +87,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
@@ -70,7 +70,7 @@ Jeremy Bornstein
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;
---- orig/rsync.yo      2005-02-11 10:53:15
+--- orig/rsync.yo      2005-02-13 21:51:10
 +++ rsync.yo   2005-02-11 22:49:10
 @@ -349,6 +349,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
@@ -78,7 +78,7 @@ Jeremy Bornstein
       --size-only             skip files that match in size
 +     --date-only             skip files that match in mod-time
       --modify-window=NUM     compare mod-times with reduced accuracy
-  -T  --temp-dir=DIR          create temporary files in directory DIR
+  -T, --temp-dir=DIR          create temporary files in directory DIR
       --compare-dest=DIR      also compare received files relative to DIR
 @@ -434,6 +435,12 @@ regardless of timestamp. This is useful 
  after using another mirroring system which may not preserve timestamps