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
-@@ -55,6 +55,7 @@ extern int implied_dirs;
+@@ -51,6 +51,7 @@ extern int implied_dirs;
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;
-@@ -73,6 +74,8 @@ int checksum_len;
+ extern struct stats stats;
+@@ -68,6 +69,8 @@ int checksum_len;
dev_t filesystem_dev; /* used to implement -x */
unsigned int file_struct_len;
static char empty_sum[MD4_SUM_LENGTH];
static int flist_count_offset;
-@@ -259,6 +262,44 @@ static mode_t from_wire_mode(int mode)
- return (mode_t)mode;
+@@ -250,6 +253,44 @@ static mode_t from_wire_mode(int mode)
+ return mode;
}
+static int fattr_compare(struct file_struct **file1, struct file_struct **file2)
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len);
-@@ -1387,6 +1428,25 @@ struct file_list *recv_file_list(int f)
+@@ -1379,6 +1420,25 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
--- 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;
+ extern int new_root_dir;
@@ -91,12 +92,15 @@ extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
+#define DEL_NO_DELETIONS (1<<2)
#define DEL_TERSE (1<<3)
-
-@@ -106,12 +110,120 @@ static int is_backup_file(char *fn)
+ enum nonregtype {
+@@ -109,12 +113,120 @@ static int is_backup_file(char *fn)
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
*/
static int delete_item(char *fname, int mode, int flags)
{
-@@ -122,6 +234,8 @@ static int delete_item(char *fname, int
+@@ -125,6 +237,8 @@ static int delete_item(char *fname, int
char *p;
if (!S_ISDIR(mode)) {
if (max_delete && ++deletion_count > max_delete)
return 0;
if (make_backups && (backup_dir || !is_backup_file(fname)))
-@@ -144,6 +258,7 @@ static int delete_item(char *fname, int
+@@ -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)
|| (dry_run && zap_dir)) {
ok = 0;
errno = ENOTEMPTY;
-@@ -186,6 +301,8 @@ static int delete_item(char *fname, int
+@@ -189,6 +304,8 @@ static int delete_item(char *fname, int
continue;
strlcpy(p, fp->basename, remainder);
delete_item(fname, fp->mode, flags & ~DEL_TERSE);
}
flist_free(dirlist);
-@@ -194,7 +311,8 @@ static int delete_item(char *fname, int
+@@ -197,7 +314,8 @@ static int delete_item(char *fname, int
pop_local_filters(save_filters);
return 0;
if (do_rmdir(fname) == 0) {
-@@ -214,15 +332,19 @@ static int delete_item(char *fname, int
+@@ -217,15 +335,19 @@ static int delete_item(char *fname, int
* 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) {
-@@ -236,6 +358,8 @@ static void delete_in_dir(struct file_li
+@@ -239,6 +361,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();
-@@ -243,12 +367,14 @@ static void delete_in_dir(struct file_li
+@@ -246,12 +370,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)
-@@ -259,6 +385,9 @@ static void delete_in_dir(struct file_li
+@@ -262,6 +388,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;
-@@ -268,18 +397,30 @@ static void delete_in_dir(struct file_li
+@@ -271,18 +400,30 @@ static void delete_in_dir(struct file_li
dirlist = get_dirlist(fbuf, dlen, 0);
flist_free(dirlist);
}
-@@ -309,9 +450,9 @@ static void do_delete_pass(struct file_l
+@@ -312,9 +453,9 @@ static void do_delete_pass(struct file_l
|| !S_ISDIR(st.st_mode))
continue;
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -756,6 +897,7 @@ static int try_dests_non(struct file_str
- return -1;
+@@ -843,6 +984,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,
-@@ -910,8 +1052,12 @@ static void recv_generator(char *fname,
- && verbose && code && f_out != -1)
- rprintf(code, "%s/\n", fname);
+@@ -1028,8 +1170,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);
+- delete_in_dir(the_file_list, fname, file, &real_st);
+ && (file->flags & FLAG_DEL_HERE)) {
-+ if (detect_renamed && statret != 0)
++ 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;
}
-@@ -1150,8 +1296,14 @@ static void recv_generator(char *fname,
+@@ -1273,8 +1419,14 @@ static void recv_generator(char *fname,
&& hard_link_check(file, ndx, fname, statret, &st,
itemizing, code, HL_SKIP))
return;
rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
return;
-@@ -1329,11 +1481,17 @@ void generate_files(int f_out, struct fi
+@@ -1460,11 +1612,17 @@ void generate_files(int f_out, struct fi
(long)getpid(), flist->count);
}
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -1388,7 +1546,23 @@ void generate_files(int f_out, struct fi
+@@ -1519,7 +1677,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
-@@ -76,6 +76,7 @@ int am_generator = 0;
+@@ -78,6 +78,7 @@ int am_generator = 0;
int am_starting_up = 1;
int relative_paths = -1;
int implied_dirs = 1;
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
-@@ -334,6 +335,7 @@ void usage(enum logcode F)
+@@ -346,6 +347,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");
-@@ -481,6 +483,7 @@ static struct poptOption long_options[]
+@@ -499,6 +501,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 },
-@@ -1340,7 +1343,7 @@ int parse_arguments(int *argc, const cha
+@@ -1362,7 +1365,7 @@ int parse_arguments(int *argc, const cha
inplace = 1;
}
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -1349,6 +1352,7 @@ int parse_arguments(int *argc, const cha
+@@ -1371,6 +1374,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;
}
-@@ -1651,6 +1655,8 @@ void server_options(char **args,int *arg
+@@ -1674,6 +1678,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
-@@ -362,6 +362,7 @@ to the detailed description below for a
+@@ -363,6 +363,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
-@@ -1240,6 +1241,15 @@ Note that the use of the bf(--delete) op
+@@ -1259,6 +1260,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
-@@ -1013,6 +1013,32 @@ int handle_partial_dir(const char *fname
+@@ -1025,6 +1025,32 @@ int handle_partial_dir(const char *fname
return 1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff