From d16b5fd621aac6ff4e7d2cdf9bb75c49096ec7c2 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 11 Nov 2006 17:32:27 +0000 Subject: [PATCH] Fixed failing hunks. --- detect-renamed.diff | 86 ++++++++++++++++++++---------------------- flags.diff | 56 +++++++++++++-------------- threaded-receiver.diff | 28 +++++++------- 3 files changed, 82 insertions(+), 88 deletions(-) diff --git a/detect-renamed.diff b/detect-renamed.diff index 7c8b07a..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_item() */ -+/* For calling delete_item() and delete_in_dir() */ +-/* 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_NO_DELETIONS (1<<2) + #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ - enum nonregtype { - TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK -@@ -116,11 +120,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; } @@ -270,7 +272,7 @@ TODO: */ static enum delret delete_item(char *fname, int mode, char *replace, int flags) { -@@ -140,6 +253,8 @@ static enum delret delete_item(char *fna +@@ -146,6 +259,8 @@ static enum delret delete_item(char *fna goto check_ret; /* OK: try to delete the directory. */ } @@ -279,33 +281,25 @@ TODO: if (!replace && max_delete >= 0 && ++deletion_count > max_delete) return DR_AT_LIMIT; -@@ -185,6 +300,8 @@ static enum delret delete_item(char *fna - /* Prep directory is to be deleted, so delete all its contents. Note - * that fname must point to a MAXPATHLEN buffer! (The buffer is used - * for recursion, but returned unchanged.) +@@ -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) { -@@ -221,6 +338,16 @@ static enum delret delete_dir_contents(c - } - - strlcpy(p, fp->basename, remainder); -+ if (detect_renamed) { -+ if (S_ISDIR(fp->mode) && flags & DEL_NO_DELETIONS) { -+ delete_dir_contents(fname, flags); -+ continue; -+ } -+ if (S_ISREG(fp->mode)) -+ look_for_rename(fp, fname, dirlist->file_pool); -+ if (flags & DEL_NO_DELETIONS) -+ continue; -+ } - result = delete_item(fname, fp->mode, NULL, flags); - if (result != DR_SUCCESS && ret == DR_SUCCESS) - ret = result == DR_PINNED ? result : DR_NOT_EMPTY; -@@ -239,15 +366,19 @@ static enum delret delete_dir_contents(c +@@ -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); + if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) + ret = DR_NOT_EMPTY; + } +@@ -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 @@ -328,7 +322,7 @@ TODO: int dlen, i; if (!flist) { -@@ -261,6 +392,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); @@ -337,7 +331,7 @@ TODO: if (allowed_lull) maybe_send_keepalive(); -@@ -268,12 +401,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)) { @@ -357,7 +351,7 @@ TODO: } while (cur_depth >= file->dir.depth && cur_depth >= min_depth) -@@ -284,6 +419,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); @@ -367,7 +361,7 @@ TODO: if (one_file_system) { if (file->flags & FLAG_TOP_DIR) filesystem_dev = stp->st_dev; -@@ -293,6 +431,11 @@ 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); @@ -379,7 +373,7 @@ TODO: /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ for (i = dirlist->count; i--; ) { -@@ -305,12 +448,19 @@ static void delete_in_dir(struct file_li +@@ -336,12 +471,19 @@ static void delete_in_dir(struct file_li f_name(fp, NULL)); continue; } @@ -401,7 +395,7 @@ TODO: flist_free(dirlist); } -@@ -340,9 +490,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"); -@@ -871,6 +1021,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, -@@ -1056,8 +1207,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; } -@@ -1309,8 +1464,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; -@@ -1496,11 +1657,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", -@@ -1555,7 +1722,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 -@@ -1264,6 +1265,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. diff --git a/flags.diff b/flags.diff index ad95622..7a36215 100644 --- a/flags.diff +++ b/flags.diff @@ -29,7 +29,7 @@ To use this patch, run these commands for a successful build: extern int preserve_uid; extern int preserve_gid; extern int relative_paths; -@@ -303,6 +304,9 @@ static void send_file_entry(struct file_ +@@ -305,6 +306,9 @@ static void send_file_entry(struct file_ unsigned short flags; static time_t modtime; static mode_t mode; @@ -39,7 +39,7 @@ To use this patch, run these commands for a successful build: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -333,6 +337,12 @@ static void send_file_entry(struct file_ +@@ -335,6 +339,12 @@ static void send_file_entry(struct file_ flags |= XMIT_SAME_MODE; else mode = file->mode; @@ -52,7 +52,7 @@ To use this patch, run these commands for a successful build: if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { if (protocol_version < 28) { -@@ -416,6 +426,10 @@ static void send_file_entry(struct file_ +@@ -418,6 +428,10 @@ static void send_file_entry(struct file_ write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -63,7 +63,7 @@ To use this patch, run these commands for a successful build: if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -483,6 +497,9 @@ static struct file_struct *receive_file_ +@@ -485,6 +499,9 @@ static struct file_struct *receive_file_ { static time_t modtime; static mode_t mode; @@ -73,7 +73,7 @@ To use this patch, run these commands for a successful build: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -556,9 +573,12 @@ static struct file_struct *receive_file_ +@@ -558,9 +575,12 @@ static struct file_struct *receive_file_ modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -87,7 +87,7 @@ To use this patch, run these commands for a successful build: if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -609,6 +629,9 @@ static struct file_struct *receive_file_ +@@ -611,6 +631,9 @@ static struct file_struct *receive_file_ file->modtime = modtime; file->length = file_length; file->mode = mode; @@ -97,7 +97,7 @@ To use this patch, run these commands for a successful build: file->uid = uid; file->gid = gid; -@@ -862,6 +885,9 @@ struct file_struct *make_file(char *fnam +@@ -871,6 +894,9 @@ struct file_struct *make_file(char *fnam file->modtime = st.st_mtime; file->length = st.st_size; file->mode = st.st_mode; @@ -109,7 +109,7 @@ To use this patch, run these commands for a successful build: --- old/generator.c +++ new/generator.c -@@ -95,6 +95,12 @@ extern struct filter_list_struct server_ +@@ -98,6 +98,12 @@ int non_perishable_cnt = 0; static int deletion_count = 0; /* used to implement --max-delete */ @@ -119,10 +119,10 @@ To use this patch, run these commands for a successful build: +#define FILEFLAGS(ff) 0 +#endif + - /* For calling delete_item() */ + /* For calling delete_item() and delete_dir_contents(). */ #define DEL_RECURSE (1<<1) /* recurse */ - -@@ -109,7 +115,6 @@ enum delret { + #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ +@@ -113,7 +119,6 @@ enum delret { /* Forward declaration for delete_item(). */ static enum delret delete_dir_contents(char *fname, int flags); @@ -130,7 +130,7 @@ To use this patch, run these commands for a successful build: static int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; -@@ -122,17 +127,20 @@ static int is_backup_file(char *fn) +@@ -126,17 +131,20 @@ static int is_backup_file(char *fn) * 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.) */ @@ -151,19 +151,19 @@ To use this patch, run these commands for a successful build: +#ifdef SUPPORT_FLAGS + make_mutable(fname, mode, fileflags); +#endif - if (S_ISDIR(mode) && flags & DEL_RECURSE) { - ret = delete_dir_contents(fname, flags); - if (ret == DR_PINNED || ret == DR_NOT_EMPTY -@@ -221,7 +229,7 @@ static enum delret delete_dir_contents(c - } - - strlcpy(p, fp->basename, remainder); -- result = delete_item(fname, fp->mode, NULL, flags); -+ result = delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), NULL, flags); - if (result != DR_SUCCESS && ret == DR_SUCCESS) - ret = result == DR_PINNED ? result : DR_NOT_EMPTY; + if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) { + ignore_perishable = 1; + /* If DEL_RECURSE is not set, this just reports emptiness. */ +@@ -248,7 +256,7 @@ 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 (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS) ++ if (delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), NULL, flags) != DR_SUCCESS) + ret = DR_NOT_EMPTY; } -@@ -307,7 +315,7 @@ static void delete_in_dir(struct file_li + +@@ -338,7 +346,7 @@ static void delete_in_dir(struct file_li } if (flist_find(flist, fp) < 0) { f_name(fp, delbuf); @@ -172,7 +172,7 @@ To use this patch, run these commands for a successful build: } } -@@ -1005,7 +1013,7 @@ static void recv_generator(char *fname, +@@ -1036,7 +1044,7 @@ static void recv_generator(char *fname, * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ if (statret == 0 && !S_ISDIR(st.st_mode)) { @@ -181,7 +181,7 @@ To use this patch, run these commands for a successful build: return; statret = -1; } -@@ -1099,7 +1107,7 @@ static void recv_generator(char *fname, +@@ -1130,7 +1138,7 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ @@ -190,7 +190,7 @@ To use this patch, run these commands for a successful build: return; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, -@@ -1170,7 +1178,7 @@ static void recv_generator(char *fname, +@@ -1201,7 +1209,7 @@ static void recv_generator(char *fname, goto return_with_success; return; } @@ -199,7 +199,7 @@ To use this patch, run these commands for a successful build: return; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, -@@ -1256,7 +1264,7 @@ static void recv_generator(char *fname, +@@ -1287,7 +1295,7 @@ static void recv_generator(char *fname, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(st.st_mode)) { diff --git a/threaded-receiver.diff b/threaded-receiver.diff index 5286c54..b107ed0 100644 --- a/threaded-receiver.diff +++ b/threaded-receiver.diff @@ -87,7 +87,7 @@ To use this patch, run these commands for a successful build: extern int protocol_version; extern int fuzzy_basis; extern int always_checksum; -@@ -95,6 +94,11 @@ extern struct filter_list_struct server_ +@@ -98,6 +97,11 @@ int non_perishable_cnt = 0; static int deletion_count = 0; /* used to implement --max-delete */ @@ -96,10 +96,10 @@ To use this patch, run these commands for a successful build: +static int GEN_make_backups; +static int GEN_csum_length; + - /* For calling delete_item() */ + /* For calling delete_item() and delete_dir_contents(). */ #define DEL_RECURSE (1<<1) /* recurse */ - -@@ -477,8 +481,8 @@ static void sum_sizes_sqroot(struct sum_ + #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ +@@ -508,8 +512,8 @@ static void sum_sizes_sqroot(struct sum_ } if (protocol_version < 27) { @@ -110,7 +110,7 @@ To use this patch, run these commands for a successful build: s2length = SUM_LENGTH; } else { int32 c; -@@ -488,7 +492,7 @@ static void sum_sizes_sqroot(struct sum_ +@@ -519,7 +523,7 @@ static void sum_sizes_sqroot(struct sum_ for (c = blength; (c >>= 1) && b; b--) {} /* add a bit, subtract rollsum, round up. */ s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */ @@ -119,7 +119,7 @@ To use this patch, run these commands for a successful build: s2length = MIN(s2length, SUM_LENGTH); } -@@ -522,7 +526,7 @@ static void generate_and_send_sums(int f +@@ -553,7 +557,7 @@ static void generate_and_send_sums(int f sum_sizes_sqroot(&sum, len); write_sum_head(f_out, &sum); @@ -128,7 +128,7 @@ To use this patch, run these commands for a successful build: return; if (len > 0) -@@ -541,7 +545,7 @@ static void generate_and_send_sums(int f +@@ -572,7 +576,7 @@ static void generate_and_send_sums(int f if (f_copy >= 0) { full_write(f_copy, map, n1); @@ -137,7 +137,7 @@ To use this patch, run these commands for a successful build: continue; } -@@ -1316,7 +1320,7 @@ static void recv_generator(char *fname, +@@ -1347,7 +1351,7 @@ static void recv_generator(char *fname, return; } @@ -146,7 +146,7 @@ To use this patch, run these commands for a successful build: return; if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) -@@ -1379,7 +1383,7 @@ static void recv_generator(char *fname, +@@ -1410,7 +1414,7 @@ static void recv_generator(char *fname, goto notify_others; } @@ -155,7 +155,7 @@ To use this patch, run these commands for a successful build: if (!(backupptr = get_backup_name(fname))) { close(fd); return; -@@ -1470,9 +1474,12 @@ void generate_files(int f_out, struct fi +@@ -1501,9 +1505,12 @@ void generate_files(int f_out, struct fi int save_ignore_existing = ignore_existing; int save_ignore_non_existing = ignore_non_existing; int save_do_progress = do_progress; @@ -169,7 +169,7 @@ To use this patch, run these commands for a successful build: if (protocol_version >= 29) { itemizing = 1; maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT; -@@ -1500,7 +1507,7 @@ void generate_files(int f_out, struct fi +@@ -1531,7 +1538,7 @@ void generate_files(int f_out, struct fi do_delete_pass(flist); do_progress = 0; @@ -178,7 +178,7 @@ To use this patch, run these commands for a successful build: whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -1509,12 +1516,6 @@ void generate_files(int f_out, struct fi +@@ -1540,12 +1547,6 @@ void generate_files(int f_out, struct fi : "enabled"); } @@ -191,7 +191,7 @@ To use this patch, run these commands for a successful build: for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; -@@ -1558,23 +1559,34 @@ void generate_files(int f_out, struct fi +@@ -1589,23 +1590,34 @@ void generate_files(int f_out, struct fi delete_in_dir(NULL, NULL, NULL, NULL); phase++; @@ -232,7 +232,7 @@ To use this patch, run these commands for a successful build: if (local_name) strlcpy(fbuf, local_name, sizeof fbuf); else -@@ -1586,27 +1598,43 @@ void generate_files(int f_out, struct fi +@@ -1617,27 +1629,43 @@ void generate_files(int f_out, struct fi phase++; ignore_non_existing = save_ignore_non_existing; ignore_existing = save_ignore_existing; -- 2.34.1