From: Wayne Davison Date: Sat, 11 Nov 2006 07:58:28 +0000 (+0000) Subject: Added missing no-delete check. X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/15894839facf0df892f0c625b1e1ab0f6e1b4a73 Added missing no-delete check. --- diff --git a/detect-renamed.diff b/detect-renamed.diff index fac42ed..7c8b07a 100644 --- a/detect-renamed.diff +++ b/detect-renamed.diff @@ -149,7 +149,7 @@ TODO: enum nonregtype { TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK -@@ -116,6 +120,113 @@ static int is_backup_file(char *fn) +@@ -116,11 +120,120 @@ static int is_backup_file(char *fn) return k > 0 && strcmp(fn+k, backup_suffix) == 0; } @@ -263,7 +263,23 @@ TODO: /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will * delete recursively. * -@@ -185,6 +296,8 @@ static enum delret delete_item(char *fna + * 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! + */ + static enum delret delete_item(char *fname, int mode, char *replace, int flags) + { +@@ -140,6 +253,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; +@@ -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.) @@ -272,7 +288,7 @@ TODO: */ static enum delret delete_dir_contents(char *fname, int flags) { -@@ -221,6 +334,16 @@ static enum delret delete_dir_contents(c +@@ -221,6 +338,16 @@ static enum delret delete_dir_contents(c } strlcpy(p, fp->basename, remainder); @@ -289,7 +305,7 @@ TODO: 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 +362,19 @@ static enum delret delete_dir_contents(c +@@ -239,15 +366,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 @@ -312,7 +328,7 @@ TODO: int dlen, i; if (!flist) { -@@ -261,6 +388,8 @@ static void delete_in_dir(struct file_li +@@ -261,6 +392,8 @@ static void delete_in_dir(struct file_li if (verbose > 2) rprintf(FINFO, "delete_in_dir(%s)\n", fbuf); @@ -321,7 +337,7 @@ TODO: if (allowed_lull) maybe_send_keepalive(); -@@ -268,12 +397,14 @@ static void delete_in_dir(struct file_li +@@ -268,12 +401,14 @@ static void delete_in_dir(struct file_li return; /* Impossible... */ if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) { @@ -341,7 +357,7 @@ TODO: } while (cur_depth >= file->dir.depth && cur_depth >= min_depth) -@@ -284,6 +415,9 @@ static void delete_in_dir(struct file_li +@@ -284,6 +419,9 @@ static void delete_in_dir(struct file_li dlen = strlen(fbuf); filt_array[cur_depth] = push_local_filters(fbuf, dlen); @@ -351,7 +367,7 @@ TODO: if (one_file_system) { if (file->flags & FLAG_TOP_DIR) filesystem_dev = stp->st_dev; -@@ -293,6 +427,11 @@ static void delete_in_dir(struct file_li +@@ -293,6 +431,11 @@ static void delete_in_dir(struct file_li dirlist = get_dirlist(fbuf, dlen, 0); @@ -363,7 +379,7 @@ TODO: /* If an item in dirlist is not found in flist, delete it * from the filesystem. */ for (i = dirlist->count; i--; ) { -@@ -305,12 +444,19 @@ static void delete_in_dir(struct file_li +@@ -305,12 +448,19 @@ static void delete_in_dir(struct file_li f_name(fp, NULL)); continue; } @@ -385,7 +401,7 @@ TODO: flist_free(dirlist); } -@@ -340,9 +486,9 @@ static void do_delete_pass(struct file_l +@@ -340,9 +490,9 @@ static void do_delete_pass(struct file_l || !S_ISDIR(st.st_mode)) continue; @@ -397,7 +413,7 @@ TODO: if (do_progress && !am_server) rprintf(FINFO, " \r"); -@@ -871,6 +1017,7 @@ static int try_dests_non(struct file_str +@@ -871,6 +1021,7 @@ static int try_dests_non(struct file_str return j; } @@ -405,7 +421,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 +1203,12 @@ static void recv_generator(char *fname, +@@ -1056,8 +1207,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 @@ -420,7 +436,7 @@ TODO: return; } -@@ -1309,8 +1460,14 @@ static void recv_generator(char *fname, +@@ -1309,8 +1464,14 @@ static void recv_generator(char *fname, && hard_link_check(file, ndx, fname, statret, &st, itemizing, code, HL_SKIP)) return; @@ -436,7 +452,7 @@ TODO: rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s", full_fname(fname)); return; -@@ -1496,11 +1653,17 @@ void generate_files(int f_out, struct fi +@@ -1496,11 +1657,17 @@ void generate_files(int f_out, struct fi (long)getpid(), flist->count); } @@ -455,7 +471,7 @@ TODO: whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -1555,7 +1718,23 @@ void generate_files(int f_out, struct fi +@@ -1555,7 +1722,23 @@ void generate_files(int f_out, struct fi } recv_generator(NULL, NULL, 0, 0, 0, code, -1); if (delete_during)