any deletions or file-updates to occur normally without interfering with
these alternate-basis discoveries.
-After applying this patch, run these commands for a successful build:
+To use this patch, run these commands for a successful build:
- ./prepare-source
- ./configure (optional if already run)
+ patch -p1 <patches/detect-renamed.diff
+ ./configure (optional if already run)
make
TODO:
--- old/flist.c
+++ new/flist.c
-@@ -56,6 +56,7 @@ extern int implied_dirs;
+@@ -54,6 +54,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 const char *io_write_phase;
-@@ -74,6 +75,8 @@ int checksum_len;
- dev_t filesystem_dev; /* used to implement -x */
- unsigned int file_struct_len;
+ extern struct stats stats;
+@@ -77,6 +78,8 @@ static dev_t tmp_rdev;
+ static struct idev tmp_idev;
+ 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;
-@@ -260,6 +263,44 @@ static mode_t from_wire_mode(int mode)
- return (mode_t)mode;
+@@ -259,6 +262,44 @@ static mode_t from_wire_mode(int mode)
+ return mode;
}
+static int fattr_compare(struct file_struct **file1, struct file_struct **file2)
+ return f1->length < f2->length ? -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);
-@@ -1388,6 +1429,25 @@ struct file_list *recv_file_list(int f)
+@@ -1411,6 +1452,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,
--- old/generator.c
+++ new/generator.c
-@@ -77,6 +77,7 @@ extern char *basis_dir[];
+@@ -76,6 +76,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 read_batch;
-@@ -92,14 +93,17 @@ extern char *backup_dir;
+ extern int new_root_dir;
+@@ -91,16 +92,19 @@ 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;
+ int non_perishable_cnt = 0;
+
static int deletion_count = 0; /* used to implement --max-delete */
+static int unexplored_dirs = 1;
- static int can_link_symlinks = 1; /* start out optimistic */
- static int can_link_devices = 1;
-
--/* For calling delete_file() */
-+/* For calling delete_item() and delete_in_dir() */
- #define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */
-+#define DEL_NO_DELETIONS (1<<2)
- #define DEL_TERSE (1<<3)
+ static FILE *delete_delay_fp = NULL;
+ 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_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
-@@ -109,12 +113,120 @@ static int is_backup_file(char *fn)
+@@ -122,11 +126,121 @@ static int is_backup_file(char *fn)
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
+ continue;
+ }
+ if (always_checksum) {
-+ if (!f->u.sum) {
++ if (!F_SUM(f)) {
+ 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,
++ /* XXX update this to new checksum var idiom! */
++ F_SUM(f) = pool_alloc(pool, MD4_SUM_LENGTH,
+ "fattr_find");
-+ file_checksum(fname, f->u.sum, f->length);
++ file_checksum(fname, F_SUM(f), f->length);
+ }
-+ 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 (errno != EEXIST)
+ handle_partial_dir(partialptr, PDIR_DELETE);
+}
-
- /* Delete a file or directory. If DEL_FORCE_RECURSE is set in the flags, or if
- * force_delete is set, 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!
++ * Also note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
*/
- static int delete_item(char *fname, int mode, int flags)
+ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
{
-@@ -125,6 +237,8 @@ static int delete_item(char *fname, int
- char *p;
-
- if (!S_ISDIR(mode)) {
-+ if (flags & DEL_NO_DELETIONS)
-+ return 0;
- if (max_delete && ++deletion_count > max_delete)
- return 0;
- if (make_backups && (backup_dir || !is_backup_file(fname)))
-@@ -147,6 +261,7 @@ static int delete_item(char *fname, int
-
- zap_dir = flags & DEL_FORCE_RECURSE || force_delete;
- if ((max_delete && ++deletion_count > max_delete)
-+ || flags & DEL_NO_DELETIONS
- || (dry_run && zap_dir)) {
- ok = 0;
- errno = ENOTEMPTY;
-@@ -189,6 +304,8 @@ static int delete_item(char *fname, int
- continue;
-
- strlcpy(p, fp->basename, remainder);
+@@ -148,6 +262,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;
+@@ -194,6 +310,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)
+ {
+@@ -250,6 +368,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);
- delete_item(fname, fp->mode, flags & ~DEL_TERSE);
+ if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
+ ret = DR_NOT_EMPTY;
}
- flist_free(dirlist);
-@@ -197,7 +314,8 @@ static int delete_item(char *fname, int
-
- pop_local_filters(save_filters);
-
-- if (max_delete && ++deletion_count > max_delete)
-+ if (flags & DEL_NO_DELETIONS
-+ || (max_delete && ++deletion_count > max_delete))
- return 0;
-
- if (do_rmdir(fname) == 0) {
-@@ -217,15 +335,19 @@ static int delete_item(char *fname, int
+@@ -334,15 +454,19 @@ static void delayed_deletions(char *delb
* 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) {
-@@ -239,6 +361,8 @@ static void delete_in_dir(struct file_li
+@@ -356,6 +480,8 @@ static void delete_in_dir(struct file_li
if (verbose > 2)
rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
-+ flags |= DEL_FORCE_RECURSE;
++ flags |= DEL_RECURSE;
+
if (allowed_lull)
maybe_send_keepalive();
-@@ -246,12 +370,14 @@ static void delete_in_dir(struct file_li
+@@ -363,12 +489,14 @@ static void delete_in_dir(struct file_li
return; /* Impossible... */
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
}
while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
-@@ -262,6 +388,9 @@ static void delete_in_dir(struct file_li
+@@ -379,6 +507,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;
-@@ -271,18 +400,30 @@ static void delete_in_dir(struct file_li
+@@ -388,6 +519,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--; ) {
- struct file_struct *fp = dirlist->files[i];
- if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
+@@ -400,15 +536,22 @@ 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);
+ }
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
-- delete_item(delbuf, fp->mode, DEL_FORCE_RECURSE);
+- 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
+- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
- }
-+ delete_item(delbuf, fp->mode, flags);
++ delete_item(delbuf, fp->mode, NULL, flags);
+ } else if (detect_renamed && S_ISDIR(fp->mode))
+ unexplored_dirs++;
}
flist_free(dirlist);
}
-@@ -312,9 +453,9 @@ static void do_delete_pass(struct file_l
+@@ -438,9 +581,9 @@ static void do_delete_pass(struct file_l
|| !S_ISDIR(st.st_mode))
continue;
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -753,6 +894,7 @@ static int try_dests_non(struct file_str
- return -1;
+@@ -971,6 +1114,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,
-@@ -894,8 +1036,12 @@ static void recv_generator(char *fname,
- && verbose && code && f_out != -1)
- rprintf(code, "%s/\n", fname);
+@@ -1157,8 +1301,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, &st);
-+ && (file->flags & FLAG_DEL_HERE)) {
-+ if (detect_renamed && statret != 0)
+- && (file->flags & FLAG_XFER_DIR))
+- delete_in_dir(the_file_list, fname, file, &real_st);
++ && (file->flags & FLAG_XFER_DIR)) {
++ if (detect_renamed && real_ret != 0)
+ unexplored_dirs++;
-+ delete_in_dir(the_file_list, fname, file, &st,
++ delete_in_dir(the_file_list, fname, file, &real_st,
+ delete_during < 0 ? DEL_NO_DELETIONS : 0);
+ }
return;
}
-@@ -1133,8 +1279,14 @@ static void recv_generator(char *fname,
- && hard_link_check(file, ndx, fname, statret, &st,
+@@ -1429,8 +1577,14 @@ static void recv_generator(char *fname,
itemizing, code, HL_SKIP))
return;
+ #endif
- if (stat_errno == ENOENT)
+ if (stat_errno == ENOENT) {
+ if (detect_renamed && unexplored_dirs > 0
rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
return;
-@@ -1309,11 +1461,17 @@ void generate_files(int f_out, struct fi
+@@ -1619,13 +1773,19 @@ 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)
+ start_delete_temp();
do_progress = 0;
- if (append_mode || whole_file < 0)
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -1368,7 +1526,23 @@ void generate_files(int f_out, struct fi
+@@ -1682,7 +1842,23 @@ void generate_files(int f_out, struct fi
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
csum_length = SUM_LENGTH;
--- old/options.c
+++ new/options.c
-@@ -78,6 +78,7 @@ int am_starting_up = 1;
- int orig_umask = 0;
+@@ -78,6 +78,7 @@ int am_generator = 0;
+ int am_starting_up = 1;
int relative_paths = -1;
int implied_dirs = 1;
+int detect_renamed = 0;
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
-@@ -335,6 +336,7 @@ void usage(enum logcode F)
+@@ -343,6 +344,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");
-@@ -480,6 +482,7 @@ static struct poptOption long_options[]
+@@ -497,6 +499,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 },
-@@ -1334,7 +1337,7 @@ int parse_arguments(int *argc, const cha
+@@ -1361,7 +1364,7 @@ int parse_arguments(int *argc, const cha
inplace = 1;
}
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -1343,6 +1346,7 @@ int parse_arguments(int *argc, const cha
+@@ -1370,6 +1373,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
+ 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
-@@ -358,6 +358,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
-@@ -1183,6 +1184,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
-@@ -997,6 +997,32 @@ int handle_partial_dir(const char *fname
+@@ -1027,6 +1027,32 @@ int handle_partial_dir(const char *fname
return 1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff