--- old/flist.c
+++ new/flist.c
-@@ -54,6 +54,7 @@ extern int non_perishable_cnt;
+@@ -56,6 +56,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;
-@@ -78,6 +79,8 @@ static dev_t tmp_rdev;
- static struct idev tmp_idev;
+@@ -86,6 +87,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 */
-@@ -260,6 +263,44 @@ static mode_t from_wire_mode(int mode)
+@@ -268,6 +271,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(F_SUM(f1), F_SUM(f2), checksum_len);
+ return u_strcmp(f1->dirname, f2->dirname);
+}
+
- static void send_directory(int f, struct file_list *flist,
- char *fbuf, int len);
+ static void send_directory(int f, struct file_list *flist, int ndx,
+ char *fbuf, int len, int flags);
-@@ -1395,6 +1436,25 @@ struct file_list *recv_file_list(int f)
+@@ -1702,6 +1744,25 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
+ 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];
-+ 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;
+ }
+
- if (f >= 0) {
- recv_uid_list(f, flist);
-
+ if (incremental) {
+ qsort(dir_flist->files + dstart, dir_flist->count - dstart,
+ sizeof dir_flist->files[0], (int (*)())file_compare);
--- old/generator.c
+++ new/generator.c
-@@ -77,6 +77,7 @@ extern char *basis_dir[];
+@@ -79,6 +79,7 @@ extern char *basis_dir[];
extern int compare_dest;
extern int copy_dest;
extern int link_dest;
extern int whole_file;
extern int list_only;
extern int new_root_dir;
-@@ -93,15 +94,18 @@ extern char *backup_dir;
- extern char *backup_suffix;
+@@ -95,6 +96,7 @@ 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 file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct server_filter_list;
++extern struct file_list the_fattr_list;
int ignore_perishable = 0;
int non_perishable_cnt = 0;
+@@ -102,12 +104,14 @@ 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 FILE *delete_delay_fp = NULL;
+ 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_RECURSE (1<<1) /* recurse */
#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
-@@ -123,11 +127,121 @@ static int is_backup_file(char *fn)
+@@ -129,11 +133,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_SUM(f)) {
++ /* 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 */
-+ /* XXX update this to new checksum var idiom! */
-+ F_SUM(f) = pool_alloc(pool, MD4_SUM_LENGTH,
-+ "fattr_find");
-+ file_checksum(fname, F_SUM(f), f->length);
++ file_checksum(fname, (char*)F_SUM(f), F_LENGTH(f));
++ f->flags |= FLAG_SENT;
+ }
+ diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len);
+ if (diff) {
+ 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];
*/
static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
{
-@@ -149,6 +263,8 @@ static enum delret delete_item(char *fbu
+@@ -155,6 +268,8 @@ static enum delret delete_item(char *fbu
goto check_ret;
/* OK: try to delete the directory. */
}
if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
return DR_AT_LIMIT;
-@@ -195,6 +311,8 @@ static enum delret delete_item(char *fbu
+@@ -201,6 +316,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.)
*/
static enum delret delete_dir_contents(char *fname, int flags)
{
-@@ -251,6 +369,8 @@ static enum delret delete_dir_contents(c
+@@ -220,7 +337,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)
+@@ -257,6 +376,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);
++ look_for_rename(fp, fname);
if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
}
-@@ -335,15 +455,19 @@ static void delayed_deletions(char *delb
+@@ -409,13 +530,17 @@ 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
+ * 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)
+- struct file_struct *file, dev_t *fs_dev)
++ struct file_struct *file, dev_t *fs_dev, int 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];
int dlen, i;
if (!flist) {
-@@ -357,6 +481,8 @@ static void delete_in_dir(struct file_li
+@@ -426,21 +551,28 @@ 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();
-@@ -364,12 +490,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,
+ flags |= DEL_NO_DELETIONS;
}
- while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
-@@ -380,6 +508,9 @@ static void delete_in_dir(struct file_li
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)
- filesystem_dev = stp->st_dev;
-@@ -389,6 +520,11 @@ static void delete_in_dir(struct file_li
+ filesystem_dev = *fs_dev;
+@@ -450,6 +582,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--; ) {
-@@ -401,15 +537,22 @@ static void delete_in_dir(struct file_li
+@@ -462,16 +599,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);
-- if (delete_delay_fp)
-+ if (delete_delay_fp && !(flags & DEL_NO_DELETIONS))
- fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0');
- else
+- 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);
flist_free(dirlist);
}
-@@ -439,9 +582,9 @@ static void do_delete_pass(struct file_l
+@@ -501,9 +645,9 @@ static void do_delete_pass(struct file_l
|| !S_ISDIR(st.st_mode))
continue;
-- delete_in_dir(flist, fbuf, file, &st);
-+ delete_in_dir(flist, fbuf, file, &st, 0);
+- delete_in_dir(flist, fbuf, file, &st.st_dev);
++ delete_in_dir(flist, 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, NULL, &dev_zero);
++ delete_in_dir(NULL, NULL, NULL, &dev_zero, 0);
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -966,6 +1109,7 @@ static int try_dests_non(struct file_str
+@@ -1038,6 +1182,7 @@ static int try_dests_non(struct file_str
return j;
}
+static struct bitbag *delayed_bits = NULL;
static int phase = 0;
- /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
-@@ -1152,8 +1296,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
+ /* Acts on cur_flist->file's ndx'th item, whose name is fname. If a dir,
+@@ -1229,8 +1374,12 @@ static void recv_generator(char *fname,
+ }
+ }
+ else if (delete_during && f_out != -1 && !phase && dry_run < 2
- && (file->flags & FLAG_XFER_DIR))
-- delete_in_dir(the_file_list, fname, file, &real_st);
+- delete_in_dir(cur_flist, fname, file, &real_st.st_dev);
+ && (file->flags & FLAG_XFER_DIR)) {
+ if (detect_renamed && real_ret != 0)
+ unexplored_dirs++;
-+ delete_in_dir(the_file_list, fname, file, &real_st,
++ delete_in_dir(cur_flist, fname, file, &real_st.st_dev,
+ delete_during < 0 ? DEL_NO_DELETIONS : 0);
+ }
return;
}
-@@ -1406,8 +1554,14 @@ static void recv_generator(char *fname,
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_SKIP))
+@@ -1494,8 +1643,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;
-@@ -1593,13 +1747,19 @@ void generate_files(int f_out, struct fi
- (long)getpid(), flist->count);
- }
+@@ -1683,6 +1838,12 @@ void generate_files(int f_out, char *loc
+ if (verbose > 2)
+ rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
+ if (detect_renamed) {
+ delayed_bits = bitbag_create(flist->count);
+ delete_during = -1;
+ }
+
- if (delete_before && !local_name && flist->count > 0)
- do_delete_pass(flist);
- if (delete_during == 2)
- start_delete_temp();
+ if (delete_before && !local_name && cur_flist->count > 0)
+ do_delete_pass(cur_flist);
+ if (delete_during == 2) {
+@@ -1693,7 +1854,7 @@ void generate_files(int f_out, char *loc
+ }
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",
-@@ -1654,7 +1814,23 @@ void generate_files(int f_out, struct fi
- }
- recv_generator(NULL, NULL, 0, 0, 0, code, -1);
- if (delete_during)
-- delete_in_dir(NULL, NULL, NULL, NULL);
-+ delete_in_dir(NULL, NULL, NULL, NULL, 0);
-+
-+ if (detect_renamed) {
-+ if (delete_during < 0)
-+ delete_during = 0;
-+ detect_renamed = 0;
+@@ -1718,7 +1879,7 @@ void generate_files(int f_out, char *loc
+ dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+ } else
+ dirdev = MAKEDEV(0, 0);
+- delete_in_dir(cur_flist, f_name(fp, fbuf), fp, &dirdev);
++ delete_in_dir(cur_flist, f_name(fp, fbuf), fp, &dirdev, 0);
+ }
+ }
+ for (i = cur_flist->low; i <= cur_flist->high; i++) {
+@@ -1764,7 +1925,21 @@ void generate_files(int f_out, char *loc
+
+ if (!incremental) {
+ if (delete_during)
+- delete_in_dir(NULL, NULL, NULL, &dev_zero);
++ delete_in_dir(NULL, 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; ) {
-+ struct file_struct *file = flist->files[i];
-+ 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);
-+ }
-+ }
-
- phase++;
- csum_length = SUM_LENGTH;
++ for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) {
++ struct file_struct *file = flist->files[i];
++ if (local_name)
++ strlcpy(fbuf, local_name, sizeof fbuf);
++ else
++ f_name(file, fbuf);
++ recv_generator(fbuf, file, i, itemizing, code, f_out);
++ }
++ }
+ phase++;
+ if (verbose > 2) {
+ rprintf(FINFO, "generate_files phase=%d\n",
--- old/options.c
+++ new/options.c
@@ -78,6 +78,7 @@ int am_generator = 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 },
-@@ -1361,7 +1364,7 @@ int parse_arguments(int *argc, const cha
+@@ -1368,7 +1371,7 @@ int parse_arguments(int *argc, const cha
inplace = 1;
}
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -1370,6 +1373,7 @@ int parse_arguments(int *argc, const cha
+@@ -1377,6 +1380,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",
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -1680,6 +1684,8 @@ void server_options(char **args,int *arg
+@@ -1690,6 +1694,8 @@ void server_options(char **args,int *arg
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";