a file that can't use it, while missing out on giving it to a file
that could use it.
+--- old/compat.c
++++ new/compat.c
+@@ -46,6 +46,7 @@ extern int preserve_hard_links;
+ extern int need_messages_from_generator;
+ extern int delete_mode, delete_before, delete_during, delete_after;
+ extern int delete_excluded;
++extern int detect_renamed;
+ extern int make_backups;
+ extern char *backup_dir, *backup_suffix;
+ extern char *partial_dir;
+@@ -161,7 +162,8 @@ void setup_protocol(int f_out,int f_in)
+ }
+ } else if (protocol_version >= 30) {
+ if (recurse && !preserve_hard_links && !delete_before
+- && !delete_after && !delay_updates && !prune_empty_dirs)
++ && !delete_after && !delay_updates && !prune_empty_dirs
++ && !detect_renamed)
+ inc_recurse = 1;
+ need_messages_from_generator = 1;
+ }
--- old/flist.c
+++ new/flist.c
-@@ -55,6 +55,7 @@ extern int non_perishable_cnt;
+@@ -57,6 +57,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;
-@@ -80,6 +81,8 @@ static int64 tmp_dev, tmp_ino;
+@@ -87,6 +88,8 @@ static int64 tmp_dev, tmp_ino;
#endif
static char tmp_sum[MD4_SUM_LENGTH];
static char empty_sum[MD4_SUM_LENGTH];
static int flist_count_offset; /* for --delete --progress */
-@@ -262,6 +265,45 @@ static mode_t from_wire_mode(int mode)
+@@ -271,6 +274,45 @@ static mode_t from_wire_mode(int mode)
return mode;
}
+ 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);
-@@ -1501,6 +1543,25 @@ struct file_list *recv_file_list(int f)
+@@ -1765,6 +1807,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];
+ the_fattr_list.high = j;
+ }
+
- if (f >= 0) {
- recv_uid_list(f, flist);
-
+ if (inc_recurse) {
+ qsort(dir_flist->files + dstart, dir_flist->count - dstart,
+ sizeof dir_flist->files[0], (int (*)())file_compare);
--- old/generator.c
+++ new/generator.c
-@@ -76,6 +76,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;
-@@ -91,6 +92,7 @@ extern char *backup_dir;
- extern char *backup_suffix;
+@@ -96,6 +97,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;
-@@ -98,12 +100,14 @@ int non_perishable_cnt = 0;
- int maybe_ATTRS_REPORT = 0;
+ int non_perishable_cnt = 0;
+@@ -103,6 +105,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 deldelay_size = 0, deldelay_cnt = 0;
static char *deldelay_buf = NULL;
static int deldelay_fd = -1;
- static BOOL solo_file = 0;
+@@ -111,7 +114,8 @@ static int dir_tweaking;
+ static int need_retouch_dir_times;
+ 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(). */
#define DEL_RECURSE (1<<1) /* recurse */
#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
-@@ -125,11 +129,120 @@ static int is_backup_file(char *fn)
+@@ -133,11 +137,120 @@ static int is_backup_file(char *fn)
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
+ continue;
+ }
+ if (always_checksum) {
-+ /* We use the FLAG_SENT flag to indicate when we
++ /* We use the FLAG_FILE_SENT flag to indicate when we
+ * have computed the checksum for an entry. */
-+ if (!(f->flags & FLAG_SENT)) {
++ if (!(f->flags & FLAG_FILE_SENT)) {
+ if (fmid->modtime == f->modtime
+ && f_name_cmp(fmid, f) == 0)
+ return -1; /* assume we can't help */
+ file_checksum(fname, (char*)F_SUM(f), F_LENGTH(f));
-+ f->flags |= FLAG_SENT;
++ f->flags |= FLAG_FILE_SENT;
+ }
+ diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len);
+ if (diff) {
*/
static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
{
-@@ -151,6 +264,8 @@ static enum delret delete_item(char *fbu
+@@ -159,6 +272,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;
-@@ -197,6 +312,8 @@ static enum delret delete_item(char *fbu
+@@ -205,6 +320,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)
{
-@@ -216,7 +333,9 @@ static enum delret delete_dir_contents(c
+@@ -224,7 +341,9 @@ static enum delret delete_dir_contents(c
save_filters = push_local_filters(fname, dlen);
non_perishable_cnt = 0;
-+ flist_extra_cnt += SUM_EXTRA_CNT;
++ file_extra_cnt += SUM_EXTRA_CNT;
dirlist = get_dirlist(fname, dlen, 0);
-+ flist_extra_cnt -= SUM_EXTRA_CNT;
++ 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
+@@ -261,6 +380,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 (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
}
-@@ -405,15 +526,19 @@ static void do_delayed_deletions(char *d
+@@ -413,13 +534,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) {
-@@ -427,6 +552,8 @@ static void delete_in_dir(struct file_li
+@@ -430,21 +555,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();
-@@ -434,12 +561,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 >= 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);
+ 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;
-@@ -459,6 +591,11 @@ static void delete_in_dir(struct file_li
+ filesystem_dev = *fs_dev;
+@@ -454,6 +586,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--; ) {
-@@ -471,16 +608,23 @@ static void delete_in_dir(struct file_li
+@@ -466,16 +603,23 @@ static void delete_in_dir(struct file_li
f_name(fp, NULL));
continue;
}
flist_free(dirlist);
}
-@@ -510,9 +654,9 @@ static void do_delete_pass(struct file_l
+@@ -505,9 +649,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");
-@@ -1047,6 +1191,7 @@ static int try_dests_non(struct file_str
+@@ -1041,6 +1185,7 @@ static int try_dests_non(struct file_str
return j;
}
+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,
-@@ -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
+@@ -1237,8 +1382,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_sx.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_sx.st.st_dev,
+ delete_during < 0 ? DEL_NO_DELETIONS : 0);
+ }
- return;
+ goto cleanup;
}
-@@ -1497,8 +1646,14 @@ static void recv_generator(char *fname,
+@@ -1510,8 +1659,14 @@ static void recv_generator(char *fname,
if (preserve_hard_links && F_HLINK_NOT_LAST(file))
- return;
+ goto cleanup;
#endif
- if (stat_errno == ENOENT)
+ if (stat_errno == ENOENT) {
+ }
rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
- return;
-@@ -1688,6 +1843,12 @@ void generate_files(int f_out, struct fi
- (long)getpid(), flist->count);
- }
+ goto cleanup;
+@@ -1818,6 +1973,12 @@ void generate_files(int f_out, const cha
+ if (verbose > 2)
+ rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
+ if (detect_renamed) {
-+ delayed_bits = bitbag_create(flist->count);
++ delayed_bits = bitbag_create(cur_flist->count);
+ 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->count > 0)
+ do_delete_pass(cur_flist);
if (delete_during == 2) {
-@@ -1698,7 +1859,7 @@ void generate_files(int f_out, struct fi
+@@ -1828,7 +1989,7 @@ void generate_files(int f_out, const cha
}
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",
-@@ -1754,7 +1915,22 @@ void generate_files(int f_out, struct fi
- }
- recv_generator(NULL, NULL, 0, 0, code, -1);
+@@ -1855,7 +2016,7 @@ void generate_files(int f_out, const cha
+ 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++) {
+@@ -1909,7 +2070,21 @@ void generate_files(int f_out, const cha
+ } while ((cur_flist = cur_flist->next) != NULL);
+
if (delete_during)
-- 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 (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
+ recv_generator(fbuf, file, i, itemizing, code, f_out);
+ }
+ }
-
phase++;
- csum_length = SUM_LENGTH;
+ if (verbose > 2)
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
--- old/options.c
+++ new/options.c
@@ -78,6 +78,7 @@ int am_generator = 0;
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
-@@ -342,6 +343,7 @@ void usage(enum logcode F)
+@@ -351,6 +352,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");
-@@ -496,6 +498,7 @@ static struct poptOption long_options[]
+@@ -508,6 +510,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 },
-@@ -1355,7 +1358,7 @@ int parse_arguments(int *argc, const cha
+@@ -1397,7 +1400,7 @@ int parse_arguments(int *argc, const cha
inplace = 1;
}
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -1364,6 +1367,7 @@ int parse_arguments(int *argc, const cha
+@@ -1406,6 +1409,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;
}
-@@ -1674,6 +1678,8 @@ void server_options(char **args,int *arg
+@@ -1719,6 +1723,8 @@ void server_options(char **args,int *arg
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
if (modify_window_set) {
--- old/rsync.yo
+++ new/rsync.yo
-@@ -364,6 +364,7 @@ to the detailed description below for a
+@@ -365,6 +365,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
-@@ -1272,6 +1273,15 @@ Note that the use of the bf(--delete) op
+@@ -1305,6 +1306,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
-@@ -1027,6 +1027,32 @@ int handle_partial_dir(const char *fname
+@@ -1026,6 +1026,32 @@ int handle_partial_dir(const char *fname
return 1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff