a file that can't use it, while missing out on giving it to a file
that could use it.
+based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -41,6 +41,7 @@ extern int checksum_seed;
+@@ -41,6 +41,7 @@ extern int read_batch;
+ extern int delay_updates;
+ extern int checksum_seed;
extern int basis_dir_cnt;
++extern int detect_renamed;
extern int prune_empty_dirs;
extern int protocol_version;
-+extern int detect_renamed;
extern int protect_args;
- extern int preserve_uid;
- extern int preserve_gid;
-@@ -120,6 +121,7 @@ void set_allow_inc_recurse(void)
+@@ -123,6 +124,7 @@ void set_allow_inc_recurse(void)
allow_inc_recurse = 0;
else if (!am_sender
&& (delete_before || delete_after
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -63,6 +63,7 @@ extern int non_perishable_cnt;
+@@ -60,6 +60,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 int munge_symlinks;
-@@ -121,6 +122,8 @@ static int64 tmp_dev, tmp_ino;
+@@ -120,6 +121,8 @@ static int64 tmp_dev = -1, tmp_ino;
#endif
static char tmp_sum[MAX_DIGEST_LEN];
static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int dir_count = 0;
-@@ -288,6 +291,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
+@@ -287,6 +290,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
return 0;
}
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
-@@ -2338,6 +2380,25 @@ struct file_list *recv_file_list(int f)
+@@ -2427,6 +2469,25 @@ struct file_list *recv_file_list(int f)
flist_sort_and_clean(flist, relative_paths);
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -80,6 +80,7 @@ extern char *basis_dir[];
+@@ -78,6 +78,7 @@ extern char *basis_dir[MAX_BASIS_DIRS+1];
extern int compare_dest;
extern int copy_dest;
extern int link_dest;
extern int whole_file;
extern int list_only;
extern int read_batch;
-@@ -98,6 +99,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 daemon_filter_list;
int ignore_perishable = 0;
int non_perishable_cnt = 0;
-@@ -105,6 +107,7 @@ int maybe_ATTRS_REPORT = 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 */
static int deldelay_size = 0, deldelay_cnt = 0;
static char *deldelay_buf = NULL;
static int deldelay_fd = -1;
-@@ -115,7 +118,7 @@ static int need_retouch_dir_times;
+@@ -113,7 +116,7 @@ static int need_retouch_dir_times;
static int need_retouch_dir_perms;
static const char *solo_file = NULL;
#define DEL_NO_UID_WRITE (1<<0) /* file/dir has our uid w/o write perm */
#define DEL_RECURSE (1<<1) /* if dir, delete all contents */
#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
-@@ -124,6 +127,7 @@ static const char *solo_file = NULL;
+@@ -122,6 +125,7 @@ static const char *solo_file = NULL;
#define DEL_FOR_SYMLINK (1<<5) /* making room for a replacement symlink */
#define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */
#define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */
#define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
-@@ -148,11 +152,121 @@ static int is_backup_file(char *fn)
+@@ -146,11 +150,121 @@ static int is_backup_file(char *fn)
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
*/
static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
{
-@@ -186,6 +300,8 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
+@@ -177,6 +291,8 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
goto check_ret;
/* OK: try to delete the directory. */
}
if (!(flags & DEL_MAKE_ROOM) && max_delete >= 0 && ++deletion_count > max_delete)
return DR_AT_LIMIT;
-@@ -241,6 +357,8 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
+@@ -232,6 +348,8 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
* 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.)
*/
static enum delret delete_dir_contents(char *fname, uint16 flags)
{
-@@ -260,7 +378,9 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
+@@ -251,7 +369,9 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
save_filters = push_local_filters(fname, dlen);
non_perishable_cnt = 0;
ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
if (!dirlist->used)
-@@ -300,7 +420,8 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
+@@ -291,7 +411,8 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
if (S_ISDIR(fp->mode)) {
if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
if (delete_item(fname, fp->mode, flags) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
}
-@@ -465,13 +586,18 @@ static void do_delayed_deletions(char *delbuf)
+@@ -456,13 +577,18 @@ static void do_delayed_deletions(char *delbuf)
* 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
+ char *p, delbuf[MAXPATHLEN];
+ unsigned remainder;
+ int dlen, i, restore_dot = 0;
- int save_uid_ndx = uid_ndx;
if (!fbuf) {
-@@ -486,17 +612,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+ change_local_filter_dir(NULL, 0, 0);
+@@ -476,17 +602,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
maybe_send_keepalive();
if (io_error && !ignore_errors) {
if (one_file_system) {
if (file->flags & FLAG_TOP_DIR)
filesystem_dev = *fs_dev;
-@@ -509,6 +640,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -496,6 +627,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
dirlist = get_dirlist(fbuf, dlen, 0);
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->used; i--; ) {
-@@ -521,6 +660,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -508,6 +647,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
f_name(fp, NULL));
continue;
}
/* Here we want to match regardless of file type. Replacement
* of a file with one of another type is handled separately by
* a delete_item call with a DEL_MAKE_ROOM flag. */
-@@ -529,14 +672,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
- if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
+@@ -516,14 +659,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+ if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
flags |= DEL_NO_UID_WRITE;
f_name(fp, delbuf);
- if (delete_during == 2) {
+ fbuf[dlen] = '\0';
+
flist_free(dirlist);
+ }
- if (!save_uid_ndx) {
-@@ -574,9 +722,9 @@ static void do_delete_pass(void)
+@@ -556,9 +704,9 @@ static void do_delete_pass(void)
|| !S_ISDIR(st.st_mode))
continue;
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -1229,6 +1377,7 @@ static void list_file_entry(struct file_struct *f)
+@@ -1269,6 +1417,7 @@ static void list_file_entry(struct file_struct *f)
}
}
static int phase = 0;
static int dflt_perms;
-@@ -1505,9 +1654,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1558,9 +1707,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
else if (delete_during && f_out != -1 && !phase
&& !(file->flags & FLAG_MISSING_DIR)) {
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
goto cleanup;
-@@ -1785,8 +1937,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1844,8 +1996,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
goto cleanup;
}
#endif
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
-@@ -2187,6 +2345,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -2254,6 +2412,12 @@ void generate_files(int f_out, const char *local_name)
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
-@@ -2197,7 +2361,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2264,7 +2428,7 @@ void generate_files(int f_out, const char *local_name)
}
do_progress = 0;
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -2239,7 +2403,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2306,7 +2470,7 @@ void generate_files(int f_out, const char *local_name)
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
-@@ -2289,7 +2453,21 @@ void generate_files(int f_out, const char *local_name)
- write_ndx(f_out, NDX_DONE);
+@@ -2353,7 +2517,21 @@ void generate_files(int f_out, const char *local_name)
+ } while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
- delete_in_dir(NULL, NULL, &dev_zero);
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -82,6 +82,7 @@ int am_generator = 0;
+@@ -81,6 +81,7 @@ int am_sender = 0;
int am_starting_up = 1;
int relative_paths = -1;
int implied_dirs = 1;
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
-@@ -392,6 +393,7 @@ void usage(enum logcode F)
+@@ -390,6 +391,7 @@ void usage(enum logcode F)
rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n");
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
-@@ -579,6 +581,7 @@ static struct poptOption long_options[] = {
+@@ -577,6 +579,7 @@ static struct poptOption long_options[] = {
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
{"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
-@@ -1591,7 +1594,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1601,7 +1604,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
inplace = 1;
}
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -1600,6 +1603,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1610,6 +1613,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -1961,6 +1965,8 @@ void server_options(char **args, int *argc_p)
+@@ -1972,6 +1976,8 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo
-@@ -389,6 +389,7 @@ to the detailed description below for a complete description. verb(
+@@ -402,6 +402,7 @@ to the detailed description below for a complete description. verb(
--modify-window=NUM compare mod-times with reduced accuracy
-T, --temp-dir=DIR create temporary files in directory DIR
-y, --fuzzy find similar file for basis if no dest file
--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
-@@ -1491,6 +1492,21 @@ Note that the use of the bf(--delete) option might get rid of any potential
+@@ -1590,6 +1591,21 @@ Note that the use of the bf(--delete) option might get rid of any potential
fuzzy-match files, so either use bf(--delete-after) or specify some
filename exclusions if you need to prevent this.
diff --git a/util.c b/util.c
--- a/util.c
+++ b/util.c
-@@ -1168,6 +1168,32 @@ int handle_partial_dir(const char *fname, int create)
+@@ -1179,6 +1179,32 @@ int handle_partial_dir(const char *fname, int create)
return 1;
}
+ return 0;
+}
+
- /**
- * Determine if a symlink points outside the current directory tree.
+ /* Determine if a symlink points outside the current directory tree.
* This is considered "unsafe" because e.g. when mirroring somebody
+ * else's machine it might allow them to establish a symlink to
git.samba.org / rsync.git / patches.git / blobdiff