X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/76c553f74d8a10a1e2f8ac39a091d390f27a4865..d4dd2dd52f48a66395428810389ef31cc0488db7:/detect-renamed.diff diff --git a/detect-renamed.diff b/detect-renamed.diff index 4f927d9..706ccd9 100644 --- a/detect-renamed.diff +++ b/detect-renamed.diff @@ -42,7 +42,7 @@ TODO: extern int protect_args; extern int preserve_uid; extern int preserve_gid; -@@ -108,6 +109,7 @@ void set_allow_inc_recurse(void) +@@ -107,6 +108,7 @@ void set_allow_inc_recurse(void) allow_inc_recurse = 0; else if (!am_sender && (delete_before || delete_after @@ -59,8 +59,8 @@ TODO: +extern int detect_renamed; extern int protocol_version; extern int sanitize_paths; - extern struct stats stats; -@@ -113,6 +114,8 @@ static int64 tmp_dev, tmp_ino; + extern int need_unsorted_flist; +@@ -117,6 +118,8 @@ static int64 tmp_dev, tmp_ino; #endif static char tmp_sum[MAX_DIGEST_LEN]; @@ -69,7 +69,7 @@ TODO: static char empty_sum[MAX_DIGEST_LEN]; static int flist_count_offset; /* for --delete --progress */ static int dir_count = 0; -@@ -252,6 +255,45 @@ static int is_excluded(char *fname, int +@@ -256,6 +259,45 @@ static int is_excluded(char *fname, int return 0; } @@ -115,7 +115,7 @@ TODO: static void send_directory(int f, struct file_list *flist, char *fbuf, int len, int flags); -@@ -2154,6 +2196,25 @@ struct file_list *recv_file_list(int f) +@@ -2169,6 +2211,25 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths); @@ -151,15 +151,15 @@ TODO: extern int whole_file; extern int list_only; extern int read_batch; -@@ -95,6 +96,7 @@ extern char *backup_suffix; +@@ -96,6 +97,7 @@ extern char *backup_suffix; extern int backup_suffix_len; 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; - #ifdef ICONV_OPTION - extern int ic_ndx; - #endif -@@ -105,6 +107,7 @@ int maybe_ATTRS_REPORT = 0; + + int ignore_perishable = 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 */ @@ -167,7 +167,7 @@ TODO: static int deldelay_size = 0, deldelay_cnt = 0; static char *deldelay_buf = NULL; static int deldelay_fd = -1; -@@ -114,7 +117,8 @@ static int need_retouch_dir_times; +@@ -112,7 +115,8 @@ static int need_retouch_dir_times; static int need_retouch_dir_perms; static const char *solo_file = NULL; @@ -177,7 +177,7 @@ TODO: #define DEL_RECURSE (1<<1) /* recurse */ #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ -@@ -136,11 +140,121 @@ static int is_backup_file(char *fn) +@@ -134,11 +138,121 @@ static int is_backup_file(char *fn) return k > 0 && strcmp(fn+k, backup_suffix) == 0; } @@ -299,7 +299,7 @@ TODO: */ static enum delret delete_item(char *fbuf, int mode, char *replace, int flags) { -@@ -162,6 +276,8 @@ static enum delret delete_item(char *fbu +@@ -160,6 +274,8 @@ static enum delret delete_item(char *fbu goto check_ret; /* OK: try to delete the directory. */ } @@ -308,7 +308,7 @@ TODO: if (!replace && max_delete >= 0 && ++deletion_count > max_delete) return DR_AT_LIMIT; -@@ -208,6 +324,8 @@ static enum delret delete_item(char *fbu +@@ -206,6 +322,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.) @@ -317,7 +317,7 @@ TODO: */ static enum delret delete_dir_contents(char *fname, int flags) { -@@ -227,7 +345,9 @@ static enum delret delete_dir_contents(c +@@ -225,7 +343,9 @@ static enum delret delete_dir_contents(c save_filters = push_local_filters(fname, dlen); non_perishable_cnt = 0; @@ -327,7 +327,7 @@ TODO: ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS; if (!dirlist->used) -@@ -264,6 +384,8 @@ static enum delret delete_dir_contents(c +@@ -262,6 +382,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; @@ -336,7 +336,7 @@ TODO: if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) ret = DR_NOT_EMPTY; } -@@ -416,13 +538,18 @@ static void do_delayed_deletions(char *d +@@ -414,13 +536,18 @@ 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 @@ -359,7 +359,7 @@ TODO: if (!fbuf) { change_local_filter_dir(NULL, 0, 0); -@@ -432,21 +559,28 @@ static void delete_in_dir(char *fbuf, st +@@ -430,21 +557,28 @@ static void delete_in_dir(char *fbuf, st if (verbose > 2) rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); @@ -393,7 +393,7 @@ TODO: if (one_file_system) { if (file->flags & FLAG_TOP_DIR) filesystem_dev = *fs_dev; -@@ -456,6 +590,14 @@ static void delete_in_dir(char *fbuf, st +@@ -454,6 +588,14 @@ static void delete_in_dir(char *fbuf, st dirlist = get_dirlist(fbuf, dlen, 0); @@ -408,7 +408,7 @@ TODO: /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ for (i = dirlist->used; i--; ) { -@@ -468,16 +610,25 @@ static void delete_in_dir(char *fbuf, st +@@ -466,16 +608,25 @@ static void delete_in_dir(char *fbuf, st f_name(fp, NULL)); continue; } @@ -437,7 +437,7 @@ TODO: flist_free(dirlist); } -@@ -507,9 +658,9 @@ static void do_delete_pass(void) +@@ -505,9 +656,9 @@ static void do_delete_pass(void) || !S_ISDIR(st.st_mode)) continue; @@ -449,7 +449,7 @@ TODO: if (do_progress && !am_server) rprintf(FINFO, " \r"); -@@ -1106,6 +1257,7 @@ static void list_file_entry(struct file_ +@@ -1139,6 +1290,7 @@ static void list_file_entry(struct file_ } } @@ -457,7 +457,7 @@ TODO: static int phase = 0; static int dflt_perms; -@@ -1350,8 +1502,12 @@ static void recv_generator(char *fname, +@@ -1383,8 +1535,12 @@ static void recv_generator(char *fname, } } else if (delete_during && f_out != -1 && !phase && dry_run < 2 @@ -472,7 +472,7 @@ TODO: goto cleanup; } -@@ -1629,8 +1785,14 @@ static void recv_generator(char *fname, +@@ -1662,8 +1818,14 @@ static void recv_generator(char *fname, goto cleanup; } #endif @@ -488,7 +488,7 @@ TODO: rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", full_fname(fname)); goto cleanup; -@@ -1966,6 +2128,12 @@ void generate_files(int f_out, const cha +@@ -2000,6 +2162,12 @@ void generate_files(int f_out, const cha if (verbose > 2) rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid()); @@ -501,7 +501,7 @@ TODO: if (delete_before && !solo_file && cur_flist->used > 0) do_delete_pass(); if (delete_during == 2) { -@@ -1976,7 +2144,7 @@ void generate_files(int f_out, const cha +@@ -2010,7 +2178,7 @@ void generate_files(int f_out, const cha } do_progress = 0; @@ -510,7 +510,7 @@ TODO: whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -2014,7 +2182,7 @@ void generate_files(int f_out, const cha +@@ -2048,7 +2216,7 @@ void generate_files(int f_out, const cha dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); } else dirdev = MAKEDEV(0, 0); @@ -519,7 +519,7 @@ TODO: } } } -@@ -2059,7 +2227,21 @@ void generate_files(int f_out, const cha +@@ -2091,7 +2259,21 @@ void generate_files(int f_out, const cha } while ((cur_flist = cur_flist->next) != NULL); if (delete_during) @@ -604,7 +604,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 -@@ -1430,6 +1431,21 @@ Note that the use of the bf(--delete) op +@@ -1438,6 +1439,21 @@ 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. @@ -628,7 +628,7 @@ TODO: files against doing transfers (if the files are missing in the destination --- old/util.c +++ new/util.c -@@ -1030,6 +1030,32 @@ int handle_partial_dir(const char *fname +@@ -1042,6 +1042,32 @@ int handle_partial_dir(const char *fname return 1; }