--- 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;
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;
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;
}
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);
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;
}
*/
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. */
}
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
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);
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)) {
}
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);
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);
/* 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;
}
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;
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;
}
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
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;
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);
}
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)
--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.
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff