--- old/flist.c
+++ new/flist.c
-@@ -51,6 +51,7 @@ extern int implied_dirs;
+@@ -55,6 +55,7 @@ extern int non_perishable_cnt;
extern int prune_empty_dirs;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
extern int sanitize_paths;
extern struct stats stats;
-@@ -68,6 +69,8 @@ int checksum_len;
- dev_t filesystem_dev; /* used to implement -x */
- unsigned int file_struct_len;
+@@ -80,6 +81,8 @@ static int64 tmp_dev, tmp_ino;
+ #endif
+ static char tmp_sum[MD4_SUM_LENGTH];
+struct file_list the_fattr_list;
+
static char empty_sum[MD4_SUM_LENGTH];
- static int flist_count_offset;
+ static int flist_count_offset; /* for --delete --progress */
-@@ -250,6 +253,44 @@ static mode_t from_wire_mode(int mode)
+@@ -262,6 +265,45 @@ static mode_t from_wire_mode(int mode)
return mode;
}
+{
+ struct file_struct *f1 = *file1;
+ struct file_struct *f2 = *file2;
++ int64 len1 = F_LENGTH(f1), len2 = F_LENGTH(f2);
+ 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;
+ }
-+ 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. */
-+ if (f1->length != f2->length)
-+ return f1->length < f2->length ? -1 : 1;
++ if (len1 != len2)
++ return len1 < len2 ? -1 : 1;
+
+ 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)
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len);
-@@ -1379,6 +1420,25 @@ struct file_list *recv_file_list(int f)
+@@ -1501,6 +1543,25 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
+ the_fattr_list.count = j;
+ 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,
+ 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;
extern int whole_file;
extern int list_only;
extern int new_root_dir;
-@@ -91,12 +92,15 @@ extern char *backup_dir;
+@@ -91,6 +92,7 @@ extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
extern struct file_list *the_file_list;
+extern struct file_list the_fattr_list;
extern struct filter_list_struct server_filter_list;
+ int ignore_perishable = 0;
+@@ -98,12 +100,14 @@ int non_perishable_cnt = 0;
+ int maybe_ATTRS_REPORT = 0;
+
static int deletion_count = 0; /* used to implement --max-delete */
+static int unexplored_dirs = 1;
-
--/* For calling delete_item() */
-+/* For calling delete_item() and delete_in_dir() */
+ static int deldelay_size = 0, deldelay_cnt = 0;
+ static char *deldelay_buf = NULL;
+ static int deldelay_fd = -1;
+ static BOOL solo_file = 0;
+
+-/* 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_DELETIONS (1<<2)
+ #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
- enum nonregtype {
- TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK
-@@ -116,6 +120,113 @@ static int is_backup_file(char *fn)
+@@ -125,11 +129,120 @@ static int is_backup_file(char *fn)
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
+ * 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;
+ 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) {
-+ if (!f->u.sum) {
++ /* We use the FLAG_SENT flag to indicate when we
++ * have computed the checksum for an entry. */
++ if (!(f->flags & FLAG_SENT)) {
+ 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, (char*)F_SUM(f), F_LENGTH(f));
++ f->flags |= FLAG_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;
+ 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;
+
-+ if ((ndx = fattr_find(file, fname, pool)) < 0)
++ if ((ndx = fattr_find(file, fname)) < 0)
+ return;
+
+ fp = the_fattr_list.files[ndx];
/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
* delete recursively.
*
-@@ -185,6 +296,8 @@ static enum delret delete_item(char *fna
- /* Prep directory is to be deleted, so delete all its contents. Note
- * that fname must point to a MAXPATHLEN buffer! (The buffer is used
- * for recursion, but returned unchanged.)
+ * 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!
+ */
+ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
+ {
+@@ -151,6 +264,8 @@ static enum delret delete_item(char *fbu
+ 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)
+ return DR_AT_LIMIT;
+@@ -197,6 +312,8 @@ static enum delret delete_item(char *fbu
+ * 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)
{
-@@ -221,6 +334,16 @@ static enum delret delete_dir_contents(c
- }
-
- strlcpy(p, fp->basename, remainder);
-+ if (detect_renamed) {
-+ if (S_ISDIR(fp->mode) && flags & DEL_NO_DELETIONS) {
-+ delete_dir_contents(fname, flags);
-+ continue;
-+ }
-+ if (S_ISREG(fp->mode))
-+ look_for_rename(fp, fname, dirlist->file_pool);
-+ if (flags & DEL_NO_DELETIONS)
-+ continue;
-+ }
- result = delete_item(fname, fp->mode, NULL, flags);
- if (result != DR_SUCCESS && ret == DR_SUCCESS)
- ret = result == DR_PINNED ? result : DR_NOT_EMPTY;
-@@ -239,15 +362,19 @@ static enum delret delete_dir_contents(c
+@@ -216,7 +333,9 @@ static enum delret delete_dir_contents(c
+ 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->count)
+@@ -253,6 +372,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);
+ if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
+ ret = DR_NOT_EMPTY;
+ }
+@@ -405,15 +526,19 @@ static void do_delayed_deletions(char *d
* 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
int dlen, i;
if (!flist) {
-@@ -261,6 +388,8 @@ static void delete_in_dir(struct file_li
+@@ -427,6 +552,8 @@ static void delete_in_dir(struct file_li
if (verbose > 2)
rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
if (allowed_lull)
maybe_send_keepalive();
-@@ -268,12 +397,14 @@ static void delete_in_dir(struct file_li
+@@ -434,12 +561,14 @@ static void delete_in_dir(struct file_li
return; /* Impossible... */
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
+ flags |= DEL_NO_DELETIONS;
}
- while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
-@@ -284,6 +415,9 @@ static void delete_in_dir(struct file_li
+ while (cur_depth >= F_DEPTH(file) && cur_depth >= min_depth)
+@@ -450,6 +579,9 @@ static void delete_in_dir(struct file_li
dlen = strlen(fbuf);
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
if (one_file_system) {
if (file->flags & FLAG_TOP_DIR)
filesystem_dev = stp->st_dev;
-@@ -293,6 +427,11 @@ static void delete_in_dir(struct file_li
+@@ -459,6 +591,11 @@ static void delete_in_dir(struct file_li
dirlist = get_dirlist(fbuf, dlen, 0);
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->count; i--; ) {
-@@ -305,12 +444,19 @@ static void delete_in_dir(struct file_li
+@@ -471,16 +608,23 @@ static void delete_in_dir(struct file_li
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) {
f_name(fp, delbuf);
-- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
+- if (delete_during == 2) {
++ if (delete_during == 2 && !(flags & DEL_NO_DELETIONS)) {
+ if (!remember_delete(fp, delbuf))
+ break;
+ } else
+- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
- }
-+ delete_item(delbuf, fp->mode, NULL, flags);
++ delete_item(delbuf, fp->mode, NULL, flags);
+ } else if (detect_renamed && S_ISDIR(fp->mode))
+ unexplored_dirs++;
}
flist_free(dirlist);
}
-@@ -340,9 +486,9 @@ static void do_delete_pass(struct file_l
+@@ -510,9 +654,9 @@ static void do_delete_pass(struct file_l
|| !S_ISDIR(st.st_mode))
continue;
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -871,6 +1017,7 @@ static int try_dests_non(struct file_str
+@@ -1047,6 +1191,7 @@ static int try_dests_non(struct file_str
return j;
}
static int phase = 0;
/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
-@@ -1056,8 +1203,12 @@ static void recv_generator(char *fname,
+@@ -1232,8 +1377,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))
+- && (file->flags & FLAG_XFER_DIR))
- delete_in_dir(the_file_list, fname, file, &real_st);
-+ && (file->flags & FLAG_DEL_HERE)) {
++ && (file->flags & FLAG_XFER_DIR)) {
+ if (detect_renamed && real_ret != 0)
+ unexplored_dirs++;
+ delete_in_dir(the_file_list, fname, file, &real_st,
return;
}
-@@ -1309,8 +1460,14 @@ static void recv_generator(char *fname,
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_SKIP))
+@@ -1497,8 +1646,14 @@ static void recv_generator(char *fname,
+ if (preserve_hard_links && F_HLINK_NOT_LAST(file))
return;
+ #endif
- 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;
+ }
rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
return;
-@@ -1496,11 +1653,17 @@ void generate_files(int f_out, struct fi
+@@ -1688,6 +1843,12 @@ void generate_files(int f_out, struct fi
(long)getpid(), flist->count);
}
+
if (delete_before && !local_name && flist->count > 0)
do_delete_pass(flist);
+ if (delete_during == 2) {
+@@ -1698,7 +1859,7 @@ void generate_files(int f_out, struct fi
+ }
do_progress = 0;
- if (append_mode || whole_file < 0)
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -1555,7 +1718,23 @@ void generate_files(int f_out, struct fi
+@@ -1754,7 +1915,22 @@ void generate_files(int f_out, struct fi
}
- recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+ recv_generator(NULL, NULL, 0, 0, code, -1);
if (delete_during)
- delete_in_dir(NULL, NULL, NULL, NULL);
+ delete_in_dir(NULL, NULL, NULL, NULL, 0);
+ 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);
+ }
+ }
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
-@@ -346,6 +347,7 @@ void usage(enum logcode F)
+@@ -342,6 +343,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," --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[]
+@@ -496,6 +498,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 },
{"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
+@@ -1355,7 +1358,7 @@ int parse_arguments(int *argc, const cha
inplace = 1;
}
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -1371,6 +1374,7 @@ int parse_arguments(int *argc, const cha
+@@ -1364,6 +1367,7 @@ int parse_arguments(int *argc, const cha
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
if (modify_window_set) {
--- old/rsync.yo
+++ new/rsync.yo
-@@ -363,6 +363,7 @@ to the detailed description below for a
+@@ -364,6 +364,7 @@ to the detailed description below for a
--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
--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
-@@ -1264,6 +1265,15 @@ Note that the use of the bf(--delete) op
+@@ -1272,6 +1273,15 @@ Note that the use of the bf(--delete) op
fuzzy-match files, so either use bf(--delete-after) or specify some
filename exclusions if you need to prevent this.
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
+@@ -1027,6 +1027,32 @@ int handle_partial_dir(const char *fname
return 1;
}