X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9a70b74359eebd085847e3937f59bc16919615da..d16b5fd621aac6ff4e7d2cdf9bb75c49096ec7c2:/detect-renamed.diff diff --git a/detect-renamed.diff b/detect-renamed.diff index f63b881..d4ed2a2 100644 --- a/detect-renamed.diff +++ b/detect-renamed.diff @@ -34,7 +34,7 @@ TODO: --- old/flist.c +++ new/flist.c -@@ -51,6 +51,7 @@ extern int implied_dirs; +@@ -53,6 +53,7 @@ extern int non_perishable_cnt; extern int prune_empty_dirs; extern int copy_links; extern int copy_unsafe_links; @@ -42,7 +42,7 @@ TODO: extern int protocol_version; extern int sanitize_paths; extern struct stats stats; -@@ -68,6 +69,8 @@ int checksum_len; +@@ -70,6 +71,8 @@ int checksum_len; dev_t filesystem_dev; /* used to implement -x */ unsigned int file_struct_len; @@ -51,7 +51,7 @@ TODO: static char empty_sum[MD4_SUM_LENGTH]; static int flist_count_offset; -@@ -250,6 +253,44 @@ static mode_t from_wire_mode(int mode) +@@ -252,6 +255,44 @@ static mode_t from_wire_mode(int mode) return mode; } @@ -96,7 +96,7 @@ TODO: static void send_directory(int f, struct file_list *flist, char *fbuf, int len); -@@ -1379,6 +1420,25 @@ struct file_list *recv_file_list(int f) +@@ -1388,6 +1429,25 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); @@ -132,24 +132,26 @@ TODO: extern int whole_file; extern int list_only; extern int new_root_dir; -@@ -91,12 +92,15 @@ extern char *backup_dir; +@@ -91,14 +92,17 @@ 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; --/* 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) +-/* 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 */ - enum nonregtype { -@@ -109,12 +113,120 @@ static int is_backup_file(char *fn) +@@ -120,11 +124,120 @@ static int is_backup_file(char *fn) return k > 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) { -@@ -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); +@@ -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); -@@ -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 +@@ -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) { -@@ -239,6 +361,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(); -@@ -246,12 +370,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) -@@ -262,6 +388,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; -@@ -271,18 +400,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); } -@@ -312,9 +453,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,7 +407,7 @@ TODO: if (do_progress && !am_server) rprintf(FINFO, " \r"); -@@ -843,6 +984,7 @@ static int try_dests_non(struct file_str +@@ -902,6 +1044,7 @@ static int try_dests_non(struct file_str return j; } @@ -421,7 +415,7 @@ TODO: static int phase = 0; /* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir, -@@ -1028,8 +1170,12 @@ static void recv_generator(char *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 @@ -436,7 +430,7 @@ TODO: return; } -@@ -1273,8 +1419,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; -@@ -1460,11 +1612,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", -@@ -1519,7 +1677,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) @@ -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 -@@ -1259,6 +1260,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.