X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6292693900fa7a084472f5ddad3ebcf0695380f6..d16b5fd621aac6ff4e7d2cdf9bb75c49096ec7c2:/detect-renamed.diff diff --git a/detect-renamed.diff b/detect-renamed.diff index 6faf82a..d4ed2a2 100644 --- a/detect-renamed.diff +++ b/detect-renamed.diff @@ -19,10 +19,10 @@ memory than trying to keep track of the matches internally, and also allows 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 0 && strcmp(fn+k, backup_suffix) == 0; } @@ -259,54 +261,45 @@ TODO: + 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 * 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 *fname, int mode, char *replace, int flags) { -@@ -122,6 +234,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))) -@@ -144,6 +258,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; -@@ -186,6 +301,8 @@ static int delete_item(char *fname, int - continue; - - strlcpy(p, fp->basename, remainder); +@@ -146,6 +259,8 @@ static enum delret delete_item(char *fna + 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; +@@ -192,6 +307,8 @@ static enum delret delete_item(char *fna + * 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) + { +@@ -248,6 +365,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); -@@ -194,7 +311,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) { -@@ -214,15 +332,19 @@ static int delete_item(char *fname, int +@@ -270,15 +389,19 @@ static enum delret delete_dir_contents(c * 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 @@ -329,16 +322,16 @@ TODO: int dlen, i; if (!flist) { -@@ -236,6 +358,8 @@ static void delete_in_dir(struct file_li +@@ -292,6 +415,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(); -@@ -243,12 +367,14 @@ static void delete_in_dir(struct file_li +@@ -299,12 +424,14 @@ static void delete_in_dir(struct file_li return; /* Impossible... */ if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { @@ -358,7 +351,7 @@ TODO: } while (cur_depth >= file->dir.depth && cur_depth >= min_depth) -@@ -259,6 +385,9 @@ static void delete_in_dir(struct file_li +@@ -315,6 +442,9 @@ static void delete_in_dir(struct file_li dlen = strlen(fbuf); filt_array[cur_depth] = push_local_filters(fbuf, dlen); @@ -368,7 +361,7 @@ TODO: 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 +@@ -324,6 +454,11 @@ static void delete_in_dir(struct file_li dirlist = get_dirlist(fbuf, dlen, 0); @@ -380,18 +373,19 @@ TODO: /* 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) +@@ -336,12 +471,19 @@ 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); +- 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++; } @@ -401,7 +395,7 @@ TODO: flist_free(dirlist); } -@@ -309,9 +450,9 @@ static void do_delete_pass(struct file_l +@@ -371,9 +513,9 @@ static void do_delete_pass(struct file_l || !S_ISDIR(st.st_mode)) continue; @@ -413,30 +407,30 @@ TODO: if (do_progress && !am_server) rprintf(FINFO, " \r"); -@@ -756,6 +897,7 @@ static int try_dests_non(struct file_str - return -1; +@@ -902,6 +1044,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); +@@ -1087,8 +1230,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, +@@ -1340,8 +1487,14 @@ static void recv_generator(char *fname, && hard_link_check(file, ndx, fname, statret, &st, itemizing, code, HL_SKIP)) return; @@ -452,7 +446,7 @@ TODO: 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 +@@ -1527,11 +1680,17 @@ void generate_files(int f_out, struct fi (long)getpid(), flist->count); } @@ -471,7 +465,7 @@ TODO: whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -1388,7 +1546,23 @@ void generate_files(int f_out, struct fi +@@ -1586,7 +1745,23 @@ void generate_files(int f_out, struct fi } recv_generator(NULL, NULL, 0, 0, 0, code, -1); if (delete_during) @@ -498,7 +492,7 @@ TODO: 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; @@ -506,7 +500,7 @@ TODO: 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"); @@ -514,7 +508,7 @@ TODO: 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 }, @@ -522,7 +516,7 @@ TODO: {"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; } @@ -531,7 +525,7 @@ TODO: 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", @@ -539,7 +533,7 @@ TODO: 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"; @@ -550,7 +544,7 @@ TODO: 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 @@ -558,7 +552,7 @@ TODO: --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 +@@ -1265,6 +1266,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. @@ -576,7 +570,7 @@ TODO: 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; }