Use "use warnings" rather than -w on the #! line.

[rsync/rsync-patches.git] / detect-renamed.diff

diff --git a/detect-renamed.diff b/detect-renamed.diff
index d4ed2a2..b40b8fa 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -32,49 +32,70 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 

---- old/flist.c
-+++ new/flist.c
-@@ -53,6 +53,7 @@ extern int non_perishable_cnt;
+diff --git a/compat.c b/compat.c
+--- a/compat.c
++++ b/compat.c
+@@ -41,6 +41,7 @@ extern int checksum_seed;
+ extern int basis_dir_cnt;
+ extern int prune_empty_dirs;
+ extern int protocol_version;
++extern int detect_renamed;
+ extern int protect_args;
+ extern int preserve_uid;
+ extern int preserve_gid;
+@@ -120,6 +121,7 @@ void set_allow_inc_recurse(void)
+               allow_inc_recurse = 0;
+       else if (!am_sender
+        && (delete_before || delete_after
++        || detect_renamed
+         || delay_updates || prune_empty_dirs))
+               allow_inc_recurse = 0;
+       else if (am_server && !local_server
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -63,6 +63,7 @@ extern int non_perishable_cnt;

  extern int prune_empty_dirs;
  extern int copy_links;
  extern int copy_unsafe_links;
 +extern int detect_renamed;
  extern int protocol_version;
  extern int sanitize_paths;
  extern int prune_empty_dirs;
  extern int copy_links;
  extern int copy_unsafe_links;
 +extern int detect_renamed;
  extern int protocol_version;
  extern int sanitize_paths;

- extern struct stats stats;
-@@ -70,6 +71,8 @@ int checksum_len;
- dev_t filesystem_dev; /* used to implement -x */
- unsigned int file_struct_len;
+ extern int munge_symlinks;
+@@ -121,6 +122,8 @@ static int64 tmp_dev, tmp_ino;
+ #endif
+ static char tmp_sum[MAX_DIGEST_LEN];

  
 +struct file_list the_fattr_list;
 +
  
 +struct file_list the_fattr_list;
 +

- static char empty_sum[MD4_SUM_LENGTH];
- static int flist_count_offset;
- 
-@@ -252,6 +255,44 @@ static mode_t from_wire_mode(int mode)
-       return mode;
+ static char empty_sum[MAX_DIGEST_LEN];
+ static int flist_count_offset; /* for --delete --progress */
+ static int dir_count = 0;
+@@ -288,6 +291,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
+       return 0;

  }
  
 +static int fattr_compare(struct file_struct **file1, struct file_struct **file2)
 +{
 +      struct file_struct *f1 = *file1;
 +      struct file_struct *f2 = *file2;
  }
  
 +static int fattr_compare(struct file_struct **file1, struct file_struct **file2)
 +{
 +      struct file_struct *f1 = *file1;
 +      struct file_struct *f2 = *file2;

++      int64 len1 = F_LENGTH(f1), len2 = F_LENGTH(f2);

 +      int diff;
 +
 +      int diff;
 +

-+      if (!f1->basename || !S_ISREG(f1->mode) || !f1->length) {
-+              if (!f2->basename || !S_ISREG(f2->mode) || !f2->length)
++      if (!f1->basename || !S_ISREG(f1->mode) || !len1) {
++              if (!f2->basename || !S_ISREG(f2->mode) || !len2)

 +                      return 0;
 +              return 1;
 +      }
 +                      return 0;
 +              return 1;
 +      }

-+      if (!f2->basename || !S_ISREG(f2->mode) || !f2->length)
++      if (!f2->basename || !S_ISREG(f2->mode) || !len2)

 +              return -1;
 +
 +      /* Don't use diff for values that are longer than an int. */
 +              return -1;
 +
 +      /* Don't use diff for values that are longer than an int. */

-+      if (f1->length != f2->length)
-+              return f1->length < f2->length ? -1 : 1;
++      if (len1 != len2)
++              return len1 < len2 ? -1 : 1;

 +
 +      if (always_checksum) {
 +
 +      if (always_checksum) {

-+              diff = u_memcmp(f1->u.sum, f2->u.sum, checksum_len);
++              diff = u_memcmp(F_SUM(f1), F_SUM(f2), checksum_len);

 +              if (diff)
 +                      return diff;
 +      } else if (f1->modtime != f2->modtime)
 +              if (diff)
 +                      return diff;
 +      } else if (f1->modtime != f2->modtime)


@@ -94,64 +115,79 @@ TODO:
 +}
 +
  static void send_directory(int f, struct file_list *flist,
 +}
 +
  static void send_directory(int f, struct file_list *flist,

-                          char *fbuf, int len);
+                          char *fbuf, int len, int flags);

  
  

-@@ -1388,6 +1429,25 @@ struct file_list *recv_file_list(int f)
+@@ -2344,6 +2386,25 @@ struct file_list *recv_file_list(int f)

  
  

-       clean_flist(flist, relative_paths, 1);
+       flist_sort_and_clean(flist, relative_paths);

  
 +      if (detect_renamed) {
  
 +      if (detect_renamed) {

-+              int j = flist->count;
-+              the_fattr_list.count = j;
++              int j = flist->used;
++              the_fattr_list.used = j;

 +              the_fattr_list.files = new_array(struct file_struct *, j);
 +              if (!the_fattr_list.files)
 +              the_fattr_list.files = new_array(struct file_struct *, j);
 +              if (!the_fattr_list.files)

-+                      goto oom;
++                      out_of_memory("recv_file_list");

 +              memcpy(the_fattr_list.files, flist->files,
 +                     j * sizeof (struct file_struct *));
 +              qsort(the_fattr_list.files, j,
 +              memcpy(the_fattr_list.files, flist->files,
 +                     j * sizeof (struct file_struct *));
 +              qsort(the_fattr_list.files, j,

-+                  sizeof the_fattr_list.files[0], (int (*)())fattr_compare);
++                    sizeof the_fattr_list.files[0], (int (*)())fattr_compare);

 +              the_fattr_list.low = 0;
 +              while (j-- > 0) {
 +                      struct file_struct *fp = the_fattr_list.files[j];
 +              the_fattr_list.low = 0;
 +              while (j-- > 0) {
 +                      struct file_struct *fp = the_fattr_list.files[j];

-+                      if (fp->basename && S_ISREG(fp->mode) && fp->length)
++                      if (fp->basename && S_ISREG(fp->mode) && F_LENGTH(fp))

 +                              break;
 +              }
 +              the_fattr_list.high = j;
 +      }
 +
 +                              break;
 +              }
 +              the_fattr_list.high = j;
 +      }
 +

-       if (f >= 0) {
-               recv_uid_list(f, flist);
- 
---- old/generator.c
-+++ new/generator.c
-@@ -76,6 +76,7 @@ extern char *basis_dir[];
+       if (protocol_version < 30) {
+               /* Recv the io_error flag */
+               if (ignore_errors)
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -80,6 +80,7 @@ extern char *basis_dir[];

  extern int compare_dest;
  extern int copy_dest;
  extern int link_dest;
 +extern int detect_renamed;
  extern int whole_file;
  extern int list_only;
  extern int compare_dest;
  extern int copy_dest;
  extern int link_dest;
 +extern int detect_renamed;
  extern int whole_file;
  extern int list_only;

- extern int new_root_dir;
-@@ -91,14 +92,17 @@ extern char *backup_dir;
- extern char *backup_suffix;
+ extern int read_batch;
+@@ -98,6 +99,7 @@ extern char *backup_suffix;

  extern int backup_suffix_len;
  extern int backup_suffix_len;

- extern struct file_list *the_file_list;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+ extern struct filter_list_struct daemon_filter_list;

 +extern struct file_list the_fattr_list;
 +extern struct file_list the_fattr_list;

- extern struct filter_list_struct server_filter_list;

  
  int ignore_perishable = 0;
  int non_perishable_cnt = 0;
  
  int ignore_perishable = 0;
  int non_perishable_cnt = 0;

+@@ -105,6 +107,7 @@ int maybe_ATTRS_REPORT = 0;

  
  

+ static dev_t dev_zero;

  static int deletion_count = 0; /* used to implement --max-delete */
 +static int unexplored_dirs = 1;
  static int deletion_count = 0; /* used to implement --max-delete */
 +static int unexplored_dirs = 1;

+ static int deldelay_size = 0, deldelay_cnt = 0;
+ static char *deldelay_buf = NULL;
+ static int deldelay_fd = -1;
+@@ -115,7 +118,7 @@ static int need_retouch_dir_times;
+ static int need_retouch_dir_perms;
+ static const char *solo_file = NULL;

  
 -/* For calling delete_item() and delete_dir_contents(). */
 +/* For calling delete_item(), delete_dir_contents(), and delete_in_dir(). */
  
 -/* For calling delete_item() and delete_dir_contents(). */
 +/* For calling delete_item(), delete_dir_contents(), and delete_in_dir(). */

-+#define DEL_NO_DELETIONS      (1<<0)
- #define DEL_RECURSE           (1<<1) /* recurse */
+ #define DEL_NO_UID_WRITE      (1<<0) /* file/dir has our uid w/o write perm */
+ #define DEL_RECURSE           (1<<1) /* if dir, delete all contents */

  #define DEL_DIR_IS_EMPTY      (1<<2) /* internal delete_FUNCTIONS use only */
  #define DEL_DIR_IS_EMPTY      (1<<2) /* internal delete_FUNCTIONS use only */

+@@ -124,6 +127,7 @@ static const char *solo_file = NULL;
+ #define DEL_FOR_SYMLINK       (1<<5) /* making room for a replacement symlink */
+ #define DEL_FOR_DEVICE                (1<<6) /* making room for a replacement device */
+ #define DEL_FOR_SPECIAL       (1<<7) /* making room for a replacement special */
++#define DEL_NO_DELETIONS      (1<<9) /* just check for renames w/o deleting */

  
  

-@@ -120,11 +124,120 @@ static int is_backup_file(char *fn)
+ #define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
+ 
+@@ -148,11 +152,121 @@ static int is_backup_file(char *fn)

        return k > 0 && strcmp(fn+k, backup_suffix) == 0;
  }
  
        return k > 0 && strcmp(fn+k, backup_suffix) == 0;
  }
  


@@ -159,7 +195,7 @@ TODO:
 + * time (plus the basename, if possible) or (2) the size & checksum.  If
 + * we find an exact match down to the dirname, return -1 because we found
 + * an up-to-date file in the transfer, not a renamed file. */
 + * time (plus the basename, if possible) or (2) the size & checksum.  If
 + * we find an exact match down to the dirname, return -1 because we found
 + * an up-to-date file in the transfer, not a renamed file. */

-+static int fattr_find(struct file_struct *f, char *fname, alloc_pool_t pool)
++static int fattr_find(struct file_struct *f, char *fname)

 +{
 +      int low = the_fattr_list.low, high = the_fattr_list.high;
 +      int mid, ok_match = -1, good_match = -1;
 +{
 +      int low = the_fattr_list.low, high = the_fattr_list.high;
 +      int mid, ok_match = -1, good_match = -1;


@@ -169,23 +205,24 @@ TODO:
 +      while (low <= high) {
 +              mid = (low + high) / 2;
 +              fmid = the_fattr_list.files[mid];
 +      while (low <= high) {
 +              mid = (low + high) / 2;
 +              fmid = the_fattr_list.files[mid];

-+              if (fmid->length != f->length) {
-+                      if (fmid->length < f->length)
++              if (F_LENGTH(fmid) != F_LENGTH(f)) {
++                      if (F_LENGTH(fmid) < F_LENGTH(f))

 +                              low = mid + 1;
 +                      else
 +                              high = mid - 1;
 +                      continue;
 +              }
 +              if (always_checksum) {
 +                              low = mid + 1;
 +                      else
 +                              high = mid - 1;
 +                      continue;
 +              }
 +              if (always_checksum) {

-+                      if (!f->u.sum) {
++                      /* We use the FLAG_FILE_SENT flag to indicate when we
++                       * have computed the checksum for an entry. */
++                      if (!(f->flags & FLAG_FILE_SENT)) {

 +                              if (fmid->modtime == f->modtime
 +                               && f_name_cmp(fmid, f) == 0)
 +                                      return -1; /* assume we can't help */
 +                              if (fmid->modtime == f->modtime
 +                               && f_name_cmp(fmid, f) == 0)
 +                                      return -1; /* assume we can't help */

-+                              f->u.sum = pool_alloc(pool, MD4_SUM_LENGTH,
-+                                                    "fattr_find");
-+                              file_checksum(fname, f->u.sum, f->length);
++                              file_checksum(fname, F_SUM(f), F_LENGTH(f));
++                              f->flags |= FLAG_FILE_SENT;

 +                      }
 +                      }

-+                      diff = u_memcmp(fmid->u.sum, f->u.sum, checksum_len);
++                      diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len);

 +                      if (diff) {
 +                              if (diff < 0)
 +                                      low = mid + 1;
 +                      if (diff) {
 +                              if (diff < 0)
 +                                      low = mid + 1;


@@ -229,15 +266,14 @@ TODO:
 +      return good_match >= 0 ? good_match : ok_match;
 +}
 +
 +      return good_match >= 0 ? good_match : ok_match;
 +}
 +

-+static void look_for_rename(struct file_struct *file, char *fname,
-+                          alloc_pool_t pool)
++static void look_for_rename(struct file_struct *file, char *fname)

 +{
 +      struct file_struct *fp;
 +      char *partialptr, *fn;
 +      STRUCT_STAT st;
 +      int ndx;
 +
 +{
 +      struct file_struct *fp;
 +      char *partialptr, *fn;
 +      STRUCT_STAT st;
 +      int ndx;
 +

-+      if ((ndx = fattr_find(file, fname, pool)) < 0)
++      if (!partial_dir || (ndx = fattr_find(file, fname)) < 0)

 +              return;
 +
 +      fp = the_fattr_list.files[ndx];
 +              return;
 +
 +      fp = the_fattr_list.files[ndx];


@@ -245,96 +281,99 @@ TODO:
 +      /* We don't provide an alternate-basis file if there is a basis file. */
 +      if (link_stat(fn, &st, 0) == 0)
 +              return;
 +      /* We don't provide an alternate-basis file if there is a basis file. */
 +      if (link_stat(fn, &st, 0) == 0)
 +              return;

-+      if ((partialptr = partial_dir_fname(fn)) == NULL
-+       || !handle_partial_dir(partialptr, PDIR_CREATE))
-+              return;

 +
 +

-+      /* We only use the file if we can hard-link it into our tmp dir. */
-+      if (link(fname, partialptr) == 0) {
-+              if (verbose > 2) {
-+                      rprintf(FINFO, "found renamed: %s => %s\n",
-+                              fname, partialptr);
++      if (!dry_run) {
++              if ((partialptr = partial_dir_fname(fn)) == NULL
++               || !handle_partial_dir(partialptr, PDIR_CREATE))
++                      return;
++              /* We only use the file if we can hard-link it into our tmp dir. */
++              if (link(fname, partialptr) != 0) {
++                      if (errno != EEXIST)
++                              handle_partial_dir(partialptr, PDIR_DELETE);
++                      return;

 +              }
 +              }

-+              return;

 +      }
 +
 +      }
 +

-+      if (errno != EEXIST)
-+              handle_partial_dir(partialptr, PDIR_DELETE);
++      /* I think this falls into the -vv category with "%s is uptodate", etc. */
++      if (verbose > 1)
++              rprintf(FINFO, "found renamed: %s => %s\n", fname, fn);

 +}
 +
  /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
   * delete recursively.
   *
 +}
 +
  /* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
   * delete recursively.
   *

-  * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's
+  * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's

   * a directory! (The buffer is used for recursion, but returned unchanged.)
 + *
 + * Also note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
   */
   * a directory! (The buffer is used for recursion, but returned unchanged.)
 + *
 + * Also note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
   */

- static enum delret delete_item(char *fname, int mode, char *replace, int flags)
+ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)

  {
  {

-@@ -146,6 +259,8 @@ static enum delret delete_item(char *fna
+@@ -186,6 +300,8 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)

                        goto check_ret;
                /* OK: try to delete the directory. */
        }
 +      if (flags & DEL_NO_DELETIONS)
 +              return DR_SUCCESS;
  
                        goto check_ret;
                /* OK: try to delete the directory. */
        }
 +      if (flags & DEL_NO_DELETIONS)
 +              return DR_SUCCESS;
  

-       if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
+       if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && ++deletion_count > max_delete)

                return DR_AT_LIMIT;
                return DR_AT_LIMIT;

-@@ -192,6 +307,8 @@ static enum delret delete_item(char *fna
+@@ -241,6 +357,8 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)

   * its contents, otherwise just checks for content.  Returns DR_SUCCESS or
   * DR_NOT_EMPTY.  Note that fname must point to a MAXPATHLEN buffer!  (The
   * buffer is used for recursion, but returned unchanged.)
 + *
 + * Note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
   */
   * its contents, otherwise just checks for content.  Returns DR_SUCCESS or
   * DR_NOT_EMPTY.  Note that fname must point to a MAXPATHLEN buffer!  (The
   * buffer is used for recursion, but returned unchanged.)
 + *
 + * Note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
   */

- static enum delret delete_dir_contents(char *fname, int flags)
+ static enum delret delete_dir_contents(char *fname, uint16 flags)

  {
  {

-@@ -248,6 +365,8 @@ static enum delret delete_dir_contents(c
-               if (S_ISDIR(fp->mode)
-                && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
-                       ret = DR_NOT_EMPTY;
-+              if (detect_renamed && S_ISREG(fp->mode))
-+                      look_for_rename(fp, fname, dirlist->file_pool);
-               if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
+@@ -260,7 +378,9 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
+       save_filters = push_local_filters(fname, dlen);
+ 
+       non_perishable_cnt = 0;
++      file_extra_cnt += SUM_EXTRA_CNT;
+       dirlist = get_dirlist(fname, dlen, 0);
++      file_extra_cnt -= SUM_EXTRA_CNT;
+       ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
+ 
+       if (!dirlist->used)
+@@ -300,7 +420,8 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
+               if (S_ISDIR(fp->mode)) {
+                       if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
+                               ret = DR_NOT_EMPTY;
+-              }
++              } else if (detect_renamed && S_ISREG(fp->mode))
++                      look_for_rename(fp, fname);
+               if (delete_item(fname, fp->mode, flags) != DR_SUCCESS)

                        ret = DR_NOT_EMPTY;
        }
                        ret = DR_NOT_EMPTY;
        }

-@@ -270,15 +389,19 @@ static enum delret delete_dir_contents(c
+@@ -465,13 +586,18 @@ static void do_delayed_deletions(char *delbuf)

   * all the --delete-WHEN options.  Note that the fbuf pointer must point to a
   * MAXPATHLEN buffer with the name of the directory in it (the functions we
   * call will append names onto the end, but the old dir value will be restored
 - * on exit). */
   * all the --delete-WHEN options.  Note that the fbuf pointer must point to a
   * MAXPATHLEN buffer with the name of the directory in it (the functions we
   * call will append names onto the end, but the old dir value will be restored
 - * on exit). */

+-static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)

 + * on exit).
 + *
 + * Note:  --detect-rename may use this routine with DEL_NO_DELETIONS set!
 + */
 + * on exit).
 + *
 + * Note:  --detect-rename may use this routine with DEL_NO_DELETIONS set!
 + */

- static void delete_in_dir(struct file_list *flist, char *fbuf,
--                        struct file_struct *file, STRUCT_STAT *stp)
-+                        struct file_struct *file, STRUCT_STAT *stp, int flags)
++static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev,
++                        int del_flags)

  {
  {

-       static int min_depth = MAXPATHLEN, cur_depth = -1;
-       static void *filt_array[MAXPATHLEN/2+1];

        static int already_warned = 0;
        struct file_list *dirlist;
 -      char delbuf[MAXPATHLEN];
        static int already_warned = 0;
        struct file_list *dirlist;
 -      char delbuf[MAXPATHLEN];

+-      int dlen, i;

 +      char *p, delbuf[MAXPATHLEN];
 +      unsigned remainder;
 +      char *p, delbuf[MAXPATHLEN];
 +      unsigned remainder;

-       int dlen, i;
- 
-       if (!flist) {
-@@ -292,6 +415,8 @@ static void delete_in_dir(struct file_li
-       if (verbose > 2)
-               rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
++      int dlen, i, restore_dot = 0;
+       int save_uid_ndx = uid_ndx;

  
  

-+      flags |= DEL_RECURSE;
-+
-       if (allowed_lull)
+       if (!fbuf) {
+@@ -486,17 +612,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)

                maybe_send_keepalive();
  
                maybe_send_keepalive();
  

-@@ -299,12 +424,14 @@ static void delete_in_dir(struct file_li
-               return; /* Impossible... */
- 
-       if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
+       if (io_error && !ignore_errors) {

 -              if (already_warned)
 +              if (!already_warned) {
 +                      rprintf(FINFO,
 -              if (already_warned)
 +              if (!already_warned) {
 +                      rprintf(FINFO,


@@ -347,152 +386,178 @@ TODO:
 -                      "IO error encountered -- skipping file deletion\n");
 -              already_warned = 1;
 -              return;
 -                      "IO error encountered -- skipping file deletion\n");
 -              already_warned = 1;
 -              return;

-+              flags |= DEL_NO_DELETIONS;
++              del_flags |= DEL_NO_DELETIONS;

        }
  
        }
  

-       while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
-@@ -315,6 +442,9 @@ static void delete_in_dir(struct file_li

        dlen = strlen(fbuf);
        dlen = strlen(fbuf);

-       filt_array[cur_depth] = push_local_filters(fbuf, dlen);
+       change_local_filter_dir(fbuf, dlen, F_DEPTH(file));

  
 +      if (detect_renamed)
 +              unexplored_dirs--;
 +
        if (one_file_system) {
                if (file->flags & FLAG_TOP_DIR)
  
 +      if (detect_renamed)
 +              unexplored_dirs--;
 +
        if (one_file_system) {
                if (file->flags & FLAG_TOP_DIR)

-                       filesystem_dev = stp->st_dev;
-@@ -324,6 +454,11 @@ static void delete_in_dir(struct file_li
+                       filesystem_dev = *fs_dev;
+@@ -509,6 +640,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)

  
        dirlist = get_dirlist(fbuf, dlen, 0);
  
 +      p = fbuf + dlen;
  
        dirlist = get_dirlist(fbuf, dlen, 0);
  
 +      p = fbuf + dlen;

-+      if (dlen != 1 || *fbuf != '/')
++      if (dlen == 1 && *fbuf == '.') {
++              restore_dot = 1;
++              p = fbuf;
++      } else if (dlen != 1 || *fbuf != '/')

 +              *p++ = '/';
 +      remainder = MAXPATHLEN - (p - fbuf);
 +
        /* If an item in dirlist is not found in flist, delete it
         * from the filesystem. */
 +              *p++ = '/';
 +      remainder = MAXPATHLEN - (p - fbuf);
 +
        /* If an item in dirlist is not found in flist, delete it
         * from the filesystem. */

-       for (i = dirlist->count; i--; ) {
-@@ -336,12 +471,19 @@ static void delete_in_dir(struct file_li
+       for (i = dirlist->used; i--; ) {
+@@ -521,6 +660,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)

                                        f_name(fp, NULL));
                        continue;
                }
 +              if (detect_renamed && S_ISREG(fp->mode)) {
 +                      strlcpy(p, fp->basename, remainder);
                                        f_name(fp, NULL));
                        continue;
                }
 +              if (detect_renamed && S_ISREG(fp->mode)) {
 +                      strlcpy(p, fp->basename, remainder);

-+                      look_for_rename(fp, fbuf, dirlist->file_pool);
++                      look_for_rename(fp, fbuf);

 +              }
 +              }

-               if (flist_find(flist, fp) < 0) {
+               /* Here we want to match regardless of file type.  Replacement
+                * of a file with one of another type is handled separately by
+                * a delete_item call with a DEL_MAKE_ROOM flag. */
+@@ -529,14 +672,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+                       if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
+                               flags |= DEL_NO_UID_WRITE;

                        f_name(fp, delbuf);
                        f_name(fp, delbuf);

--                      delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
+-                      if (delete_during == 2) {
+-                              if (!remember_delete(fp, delbuf, flags))
++                      if (delete_during == 2 && !(del_flags & DEL_NO_DELETIONS)) {
++                              if (!remember_delete(fp, delbuf, del_flags | flags))
+                                       break;
+                       } else
+-                              delete_item(delbuf, fp->mode, flags);

 -              }
 -              }

-+                      delete_item(delbuf, fp->mode, NULL, flags);
++                              delete_item(delbuf, fp->mode, del_flags | flags);

 +              } else if (detect_renamed && S_ISDIR(fp->mode))
 +                      unexplored_dirs++;
        }
  
 +              } else if (detect_renamed && S_ISDIR(fp->mode))
 +                      unexplored_dirs++;
        }
  

++      if (restore_dot)
++              fbuf[0] = '.';

 +      fbuf[dlen] = '\0';
 +
        flist_free(dirlist);
 +      fbuf[dlen] = '\0';
 +
        flist_free(dirlist);

- }

  
  

-@@ -371,9 +513,9 @@ static void do_delete_pass(struct file_l
+       if (!save_uid_ndx) {
+@@ -574,9 +722,9 @@ static void do_delete_pass(void)

                 || !S_ISDIR(st.st_mode))
                        continue;
  
                 || !S_ISDIR(st.st_mode))
                        continue;
  

--              delete_in_dir(flist, fbuf, file, &st);
-+              delete_in_dir(flist, fbuf, file, &st, 0);
+-              delete_in_dir(fbuf, file, &st.st_dev);
++              delete_in_dir(fbuf, file, &st.st_dev, 0);

        }
        }

--      delete_in_dir(NULL, NULL, NULL, NULL);
-+      delete_in_dir(NULL, NULL, NULL, NULL, 0);
+-      delete_in_dir(NULL, NULL, &dev_zero);
++      delete_in_dir(NULL, NULL, &dev_zero, 0);

  
        if (do_progress && !am_server)
                rprintf(FINFO, "                    \r");
  
        if (do_progress && !am_server)
                rprintf(FINFO, "                    \r");

-@@ -902,6 +1044,7 @@ static int try_dests_non(struct file_str
-       return j;
+@@ -1229,6 +1377,7 @@ static void list_file_entry(struct file_struct *f)
+       }

  }
  
 +static struct bitbag *delayed_bits = NULL;
  static int phase = 0;
  }
  
 +static struct bitbag *delayed_bits = NULL;
  static int phase = 0;

+ static int dflt_perms;

  
  

- /* Acts on the_file_list->file's ndx'th item, whose name is fname.  If a dir,
-@@ -1087,8 +1230,12 @@ static void recv_generator(char *fname, 
-               if (real_ret != 0 && one_file_system)
-                       real_st.st_dev = filesystem_dev;
-               if (delete_during && f_out != -1 && !phase && dry_run < 2
--                  && (file->flags & FLAG_DEL_HERE))
--                      delete_in_dir(the_file_list, fname, file, &real_st);
-+                  && (file->flags & FLAG_DEL_HERE)) {
-+                      if (detect_renamed && real_ret != 0)
-+                              unexplored_dirs++;
-+                      delete_in_dir(the_file_list, fname, file, &real_st,
-+                                    delete_during < 0 ? DEL_NO_DELETIONS : 0);
-+              }
-               return;
-       }
- 
-@@ -1340,8 +1487,14 @@ static void recv_generator(char *fname, 
-                   && hard_link_check(file, ndx, fname, statret, &st,
-                                      itemizing, code, HL_SKIP))
-                       return;
+@@ -1505,9 +1654,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+               }
+               else if (delete_during && f_out != -1 && !phase
+                   && !(file->flags & FLAG_MISSING_DIR)) {
+-                      if (file->flags & FLAG_CONTENT_DIR)
+-                              delete_in_dir(fname, file, &real_sx.st.st_dev);
+-                      else
++                      if (file->flags & FLAG_CONTENT_DIR) {
++                              if (detect_renamed && real_ret != 0)
++                                      unexplored_dirs++;
++                              delete_in_dir(fname, file, &real_sx.st.st_dev,
++                                            delete_during < 0 ? DEL_NO_DELETIONS : 0);
++                      } else
+                               change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
+               }
+               goto cleanup;
+@@ -1785,8 +1937,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+                       goto cleanup;
+               }
+ #endif

 -              if (stat_errno == ENOENT)
 +              if (stat_errno == ENOENT) {
 +                      if (detect_renamed && unexplored_dirs > 0
 -              if (stat_errno == ENOENT)
 +              if (stat_errno == ENOENT) {
 +                      if (detect_renamed && unexplored_dirs > 0

-+                       && file->length) {
++                       && F_LENGTH(file)) {

 +                              bitbag_set_bit(delayed_bits, ndx);
 +                              return;
 +                      }
                        goto notify_others;
 +              }
 +                              bitbag_set_bit(delayed_bits, ndx);
 +                              return;
 +                      }
                        goto notify_others;
 +              }

-               rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
+               rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",

                        full_fname(fname));
                        full_fname(fname));

-               return;
-@@ -1527,11 +1680,17 @@ void generate_files(int f_out, struct fi
-                       (long)getpid(), flist->count);
-       }
+               goto cleanup;
+@@ -2187,6 +2345,12 @@ void generate_files(int f_out, const char *local_name)
+       if (verbose > 2)
+               rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());

  
 +      if (detect_renamed) {
  
 +      if (detect_renamed) {

-+              delayed_bits = bitbag_create(flist->count);
++              delayed_bits = bitbag_create(cur_flist->used);

 +              if (!delete_before && !delete_during)
 +                      delete_during = -1;
 +      }
 +
 +              if (!delete_before && !delete_during)
 +                      delete_during = -1;
 +      }
 +

-       if (delete_before && !local_name && flist->count > 0)
-               do_delete_pass(flist);
+       if (delete_before && !solo_file && cur_flist->used > 0)
+               do_delete_pass();
+       if (delete_during == 2) {
+@@ -2197,7 +2361,7 @@ void generate_files(int f_out, const char *local_name)
+       }

        do_progress = 0;
  
        do_progress = 0;
  

--      if (append_mode || whole_file < 0)
-+      if (append_mode || detect_renamed || whole_file < 0)
+-      if (append_mode > 0 || whole_file < 0)
++      if (append_mode > 0 || detect_renamed || whole_file < 0)

                whole_file = 0;
        if (verbose >= 2) {
                rprintf(FINFO, "delta-transmission %s\n",
                whole_file = 0;
        if (verbose >= 2) {
                rprintf(FINFO, "delta-transmission %s\n",

-@@ -1586,7 +1745,23 @@ void generate_files(int f_out, struct fi
-       }
-       recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+@@ -2239,7 +2403,7 @@ void generate_files(int f_out, const char *local_name)
+                                               dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+                                       } else
+                                               dirdev = MAKEDEV(0, 0);
+-                                      delete_in_dir(fbuf, fp, &dirdev);
++                                      delete_in_dir(fbuf, fp, &dirdev, 0);
+                               } else
+                                       change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
+                       }
+@@ -2289,7 +2453,21 @@ void generate_files(int f_out, const char *local_name)
+               write_ndx(f_out, NDX_DONE);
+ 

        if (delete_during)
        if (delete_during)

--              delete_in_dir(NULL, NULL, NULL, NULL);
-+              delete_in_dir(NULL, NULL, NULL, NULL, 0);
-+
+-              delete_in_dir(NULL, NULL, &dev_zero);
++              delete_in_dir(NULL, NULL, &dev_zero, 0);

 +      if (detect_renamed) {
 +              if (delete_during < 0)
 +                      delete_during = 0;
 +              detect_renamed = 0;
 +
 +              for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) {
 +      if (detect_renamed) {
 +              if (delete_during < 0)
 +                      delete_during = 0;
 +              detect_renamed = 0;
 +
 +              for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) {

-+                      struct file_struct *file = flist->files[i];
++                      struct file_struct *file = cur_flist->files[i];

 +                      if (local_name)
 +                              strlcpy(fbuf, local_name, sizeof fbuf);
 +                      else
 +                              f_name(file, fbuf);
 +                      if (local_name)
 +                              strlcpy(fbuf, local_name, sizeof fbuf);
 +                      else
 +                              f_name(file, fbuf);

-+                      recv_generator(fbuf, file, i, itemizing,
-+                                     maybe_ATTRS_REPORT, code, f_out);
++                      recv_generator(fbuf, file, i, itemizing, code, f_out);

 +              }
 +      }
 +              }
 +      }

- 

        phase++;
        phase++;

-       csum_length = SUM_LENGTH;
---- old/options.c
-+++ new/options.c
-@@ -78,6 +78,7 @@ int am_generator = 0;
+       if (verbose > 2)
+               rprintf(FINFO, "generate_files phase=%d\n", phase);
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -82,6 +82,7 @@ int am_generator = 0;

  int am_starting_up = 1;
  int relative_paths = -1;
  int implied_dirs = 1;
  int am_starting_up = 1;
  int relative_paths = -1;
  int implied_dirs = 1;


@@ -500,7 +565,7 @@ TODO:
  int numeric_ids = 0;
  int allow_8bit_chars = 0;
  int force_delete = 0;
  int numeric_ids = 0;
  int allow_8bit_chars = 0;
  int force_delete = 0;

-@@ -346,6 +347,7 @@ void usage(enum logcode F)
+@@ -392,6 +393,7 @@ void usage(enum logcode F)

    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");


@@ -508,15 +573,15 @@ TODO:
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");

-@@ -499,6 +501,7 @@ static struct poptOption long_options[] 
+@@ -579,6 +581,7 @@ static struct poptOption long_options[] = {

    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
 +  {"detect-renamed",   0,  POPT_ARG_NONE,   &detect_renamed, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
 +  {"detect-renamed",   0,  POPT_ARG_NONE,   &detect_renamed, 0, 0, 0 },

-   {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
-   {"compress",        'z', POPT_ARG_NONE,   0, 'z', 0, 0 },
-   {"compress-level",   0,  POPT_ARG_INT,    &def_compress_level, 'z', 0, 0 },
-@@ -1362,7 +1365,7 @@ int parse_arguments(int *argc, const cha
+   {"fuzzy",           'y', POPT_ARG_VAL,    &fuzzy_basis, 1, 0, 0 },
+   {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
+   {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
+@@ -1591,7 +1594,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)

                inplace = 1;
        }
  
                inplace = 1;
        }
  


@@ -525,7 +590,7 @@ TODO:
                partial_dir = tmp_partialdir;
  
        if (inplace) {
                partial_dir = tmp_partialdir;
  
        if (inplace) {

-@@ -1371,6 +1374,7 @@ int parse_arguments(int *argc, const cha
+@@ -1600,6 +1603,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)

                        snprintf(err_buf, sizeof err_buf,
                                 "--%s cannot be used with --%s\n",
                                 append_mode ? "append" : "inplace",
                        snprintf(err_buf, sizeof err_buf,
                                 "--%s cannot be used with --%s\n",
                                 append_mode ? "append" : "inplace",


@@ -533,18 +598,19 @@ TODO:
                                 delay_updates ? "delay-updates" : "partial-dir");
                        return 0;
                }
                                 delay_updates ? "delay-updates" : "partial-dir");
                        return 0;
                }

-@@ -1674,6 +1678,8 @@ void server_options(char **args,int *arg
+@@ -1961,6 +1965,8 @@ void server_options(char **args, int *argc_p)

                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";
 +              if (detect_renamed)
 +                      args[ac++] = "--detect-renamed";
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";
 +              if (detect_renamed)
 +                      args[ac++] = "--detect-renamed";

-       }
- 
-       if (modify_window_set) {
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -363,6 +363,7 @@ to the detailed description below for a 
+       } else {
+               if (skip_compress) {
+                       if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0)
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -389,6 +389,7 @@ to the detailed description below for a complete description.  verb(

       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
   -y, --fuzzy                 find similar file for basis if no dest file
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
   -y, --fuzzy                 find similar file for basis if no dest file


@@ -552,13 +618,19 @@ TODO:
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged

-@@ -1265,6 +1266,15 @@ Note that the use of the bf(--delete) op
+@@ -1491,6 +1492,21 @@ Note that the use of the bf(--delete) option might get rid of any potential

  fuzzy-match files, so either use bf(--delete-after) or specify some
  filename exclusions if you need to prevent this.
  
  fuzzy-match files, so either use bf(--delete-after) or specify some
  filename exclusions if you need to prevent this.
  

-+dit(bf(--detect-renamed)) This option tells rsync to scan the receiving
-+side for files that have been renamed, and to use any that are found as
-+alternate basis files to help speed up the transfer.
++dit(bf(--detect-renamed)) With this option, for each new source file
++(call it em(src/S)), rsync looks for a file em(dest/D) anywhere in the
++destination that passes the quick check with em(src/S).  If such a em(dest/D)
++is found, rsync uses it as an alternate basis for transferring em(S).  The
++idea is that if em(src/S) was renamed from em(src/D) (as opposed to em(src/S)
++passing the quick check with em(dest/D) by coincidence), the delta-transfer
++algorithm will find that all the data matches between em(src/S) and em(dest/D),
++and the transfer will be really fast.
++

 +By default, alternate-basis files are hard-linked into a directory named
 +".~tmp~" in each file's destination directory, but if you've specified
 +the bf(--partial-dir) option, that directory will be used instead.  These
 +By default, alternate-basis files are hard-linked into a directory named
 +".~tmp~" in each file's destination directory, but if you've specified
 +the bf(--partial-dir) option, that directory will be used instead.  These


@@ -568,9 +640,10 @@ TODO:
  dit(bf(--compare-dest=DIR)) This option instructs rsync to use em(DIR) on
  the destination machine as an additional hierarchy to compare destination
  files against doing transfers (if the files are missing in the destination
  dit(bf(--compare-dest=DIR)) This option instructs rsync to use em(DIR) on
  the destination machine as an additional hierarchy to compare destination
  files against doing transfers (if the files are missing in the destination

---- old/util.c
-+++ new/util.c
-@@ -1025,6 +1025,32 @@ int handle_partial_dir(const char *fname
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -1168,6 +1168,32 @@ int handle_partial_dir(const char *fname, int create)

        return 1;
  }
  
        return 1;
  }