a file that can't use it, while missing out on giving it to a file
that could use it.
-based-on: 0b2d5fe4940211ba25a89f18a9889b9ab55d38ef
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
diff --git a/backup.c b/backup.c
--- a/backup.c
+++ b/backup.c
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -38,6 +38,7 @@ extern int checksum_seed;
+@@ -40,6 +40,7 @@ extern int checksum_seed;
extern int basis_dir_cnt;
extern int prune_empty_dirs;
extern int protocol_version;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
-@@ -155,6 +156,7 @@ void set_allow_inc_recurse(void)
+@@ -168,6 +169,7 @@ void set_allow_inc_recurse(void)
allow_inc_recurse = 0;
else if (!am_sender
&& (delete_before || delete_after
+ || detect_renamed
|| delay_updates || prune_empty_dirs))
allow_inc_recurse = 0;
- else if (am_server && !local_server
+ else if (am_server && strchr(client_info, 'i') == NULL)
diff --git a/delete.c b/delete.c
--- a/delete.c
+++ b/delete.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -63,6 +63,7 @@ extern int non_perishable_cnt;
+@@ -65,6 +65,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;
-@@ -129,6 +130,8 @@ static int64 tmp_dev = -1, tmp_ino;
+@@ -131,6 +132,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 show_filelist_progress;
-@@ -275,6 +278,45 @@ static inline int is_excluded(const char *fname, int is_dir, int filter_level)
+@@ -278,6 +281,45 @@ static inline int is_excluded(const char *fname, int is_dir, int filter_level)
return name_is_excluded(fname, is_dir ? NAME_IS_DIR : NAME_IS_FILE, filter_level);
}
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
-@@ -2635,6 +2677,25 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+@@ -2720,6 +2762,23 @@ struct file_list *recv_file_list(int f, int dir_ndx)
* for a non-relative transfer in recv_file_entry(). */
flist_sort_and_clean(flist, relative_paths);
+ int j = flist->used;
+ the_fattr_list.used = j;
+ the_fattr_list.files = new_array(struct file_struct *, j);
-+ if (!the_fattr_list.files)
-+ out_of_memory("recv_file_list");
+ memcpy(the_fattr_list.files, flist->files,
+ j * sizeof (struct file_struct *));
+ qsort(the_fattr_list.files, j,
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -79,6 +79,7 @@ extern int always_checksum;
+@@ -81,6 +81,7 @@ extern int always_checksum;
extern int flist_csum_len;
extern char *partial_dir;
extern int alt_dest_type;
extern int whole_file;
extern int list_only;
extern int read_batch;
-@@ -97,11 +98,13 @@ extern char *tmpdir;
+@@ -99,11 +100,13 @@ extern char *tmpdir;
extern char *basis_dir[MAX_BASIS_DIRS+1];
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern filter_rule_list filter_list, daemon_filter_list;
static int deldelay_size = 0, deldelay_cnt = 0;
static char *deldelay_buf = NULL;
static int deldelay_fd = -1;
-@@ -269,14 +272,19 @@ static void do_delayed_deletions(char *delbuf)
+@@ -268,14 +271,19 @@ 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
- * on exit). */
--static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+-static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t fs_dev)
+ * on exit).
+ *
+ * Note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
+ */
-+static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev,
++static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t fs_dev,
+ int del_flags)
{
static int already_warned = 0;
if (!fbuf) {
change_local_filter_dir(NULL, 0, 0);
-@@ -290,17 +298,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -289,17 +297,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t fs_dev)
maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
if (io_error & IOERR_GENERAL && !ignore_errors) {
if (one_file_system) {
if (!dev_tbl)
dev_tbl = hashtable_create(16, HT_KEY64);
-@@ -316,6 +329,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -315,6 +328,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--; ) {
-@@ -328,6 +349,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -327,6 +348,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. */
-@@ -336,14 +361,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+@@ -335,14 +360,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);
flist_free(dirlist);
}
-@@ -379,14 +409,125 @@ static void do_delete_pass(void)
+@@ -378,14 +408,125 @@ static void do_delete_pass(void)
|| !S_ISDIR(st.st_mode))
continue;
-- delete_in_dir(fbuf, file, &st.st_dev);
-+ delete_in_dir(fbuf, file, &st.st_dev, 0);
+- delete_in_dir(fbuf, file, st.st_dev);
++ delete_in_dir(fbuf, file, st.st_dev, 0);
}
-- delete_in_dir(NULL, NULL, &dev_zero);
-+ delete_in_dir(NULL, NULL, &dev_zero, 0);
+- delete_in_dir(NULL, NULL, dev_zero);
++ delete_in_dir(NULL, NULL, dev_zero, 0);
if (INFO_GTE(FLIST, 2) && !am_server)
rprintf(FINFO, " \r");
static inline int mtime_differs(STRUCT_STAT *stp, struct file_struct *file)
{
#ifdef ST_MTIME_NSEC
-@@ -1164,6 +1305,7 @@ static void list_file_entry(struct file_struct *f)
+@@ -1179,6 +1320,7 @@ static void list_file_entry(struct file_struct *f)
}
}
static int phase = 0;
static int dflt_perms;
-@@ -1294,7 +1436,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1315,7 +1457,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
&& do_stat(dn, &sx.st) < 0) {
if (dry_run)
goto parent_is_dry_missing;
rsyserr(FERROR_XFER, errno,
"recv_generator: mkdir %s failed",
full_fname(dn));
-@@ -1430,7 +1572,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1468,7 +1610,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (real_ret != 0 && do_mkdir(fname,file->mode|added_perms) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
|| (do_mkdir(fname, file->mode|added_perms) < 0 && errno != EEXIST)) {
rsyserr(FERROR_XFER, errno,
"recv_generator: mkdir %s failed",
-@@ -1478,9 +1620,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1516,9 +1658,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)) {
- if (file->flags & FLAG_CONTENT_DIR)
-- delete_in_dir(fname, file, &real_sx.st.st_dev);
+- delete_in_dir(fname, file, real_sx.st.st_dev);
- else
+ if (file->flags & FLAG_CONTENT_DIR) {
+ if (detect_renamed && real_ret != 0)
+ unexplored_dirs++;
-+ delete_in_dir(fname, file, &real_sx.st.st_dev,
++ delete_in_dir(fname, file, real_sx.st.st_dev,
+ delete_during < 0 ? DEL_NO_DELETIONS : 0);
+ } else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
prior_dir_file = file;
-@@ -1757,8 +1902,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1786,8 +1931,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;
-@@ -2222,6 +2373,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -2253,6 +2404,12 @@ void generate_files(int f_out, const char *local_name)
if (DEBUG_GTE(GENR, 1))
rprintf(FINFO, "generator starting pid=%d\n", (int)getpid());
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
-@@ -2232,7 +2389,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2261,7 +2418,7 @@ void generate_files(int f_out, const char *local_name)
}
info_levels[INFO_FLIST] = info_levels[INFO_PROGRESS] = 0;
whole_file = 0;
if (DEBUG_GTE(FLIST, 1)) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -2268,7 +2425,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2297,7 +2454,7 @@ void generate_files(int f_out, const char *local_name)
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
-- delete_in_dir(fbuf, fp, &dirdev);
-+ delete_in_dir(fbuf, fp, &dirdev, 0);
+- delete_in_dir(fbuf, fp, dirdev);
++ delete_in_dir(fbuf, fp, dirdev, 0);
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
-@@ -2315,7 +2472,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -2344,7 +2501,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);
-+ delete_in_dir(NULL, NULL, &dev_zero, 0);
+- delete_in_dir(NULL, NULL, dev_zero);
++ delete_in_dir(NULL, NULL, dev_zero, 0);
+ if (detect_renamed) {
+ if (delete_during < 0)
+ delete_during = 0;
phase++;
if (DEBUG_GTE(GENR, 1))
rprintf(FINFO, "generate_files phase=%d\n", phase);
+diff --git a/main.c b/main.c
+--- a/main.c
++++ b/main.c
+@@ -715,7 +715,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
+
+ if (mkpath_dest_arg && statret < 0 && (cp || file_total > 1)) {
+ int save_errno = errno;
+- int ret = make_path(dest_path, file_total > 1 && !trailing_slash ? 0 : MKP_DROP_NAME);
++ int ret = make_path(dest_path, ACCESSPERMS, file_total > 1 && !trailing_slash ? 0 : MKP_DROP_NAME);
+ if (ret < 0)
+ goto mkdir_error;
+ if (ret && (INFO_GTE(NAME, 1) || stdout_format_has_i)) {
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -86,6 +86,7 @@ int am_server = 0;
+@@ -91,6 +91,7 @@ int am_server = 0;
int am_sender = 0;
int am_starting_up = 1;
int relative_paths = -1;
int implied_dirs = 1;
int missing_args = 0; /* 0 = FERROR_XFER, 1 = ignore, 2 = delete */
int numeric_ids = 0;
-@@ -891,6 +892,7 @@ static struct poptOption long_options[] = {
+@@ -742,6 +743,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_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
-@@ -2296,7 +2298,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2379,7 +2381,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
inplace = 1;
}
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -2305,6 +2307,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2388,6 +2390,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;
}
-@@ -2707,6 +2710,8 @@ void server_options(char **args, int *argc_p)
+@@ -2809,6 +2812,8 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
diff --git a/receiver.c b/receiver.c
--- a/receiver.c
+++ b/receiver.c
-@@ -217,7 +217,7 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
+@@ -218,7 +218,7 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
* information should have been previously transferred, but that may
* not be the case with -R */
if (fd == -1 && relative_paths && errno == ENOENT
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -418,6 +418,7 @@ detailed description below for a complete description.
+@@ -446,6 +446,7 @@ has its own detailed description later in this manpage.
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
-@@ -2160,6 +2161,22 @@ your home directory (remove the '=' for that).
- fuzzy-match files, so either use `--delete-after` or specify some filename
- exclusions if you need to prevent this.
+@@ -2539,6 +2540,22 @@ expand it.
+ potential fuzzy-match files, so either use [`--delete-after`](#opt) or
+ specify some filename exclusions if you need to prevent this.
+0. `--detect-renamed`
+
+
+ By default, alternate-basis files are hard-linked into a directory named
+ ".~tmp~" in each file's destination directory, but if you've specified the
-+ `--partial-dir` option, that directory will be used instead. These
++ [`--partial-dir`](#opt) option, that directory will be used instead. These
+ otential alternate-basis files will be removed as the transfer progresses.
-+ This option conflicts with `--inplace` and `--append`.
++ This option conflicts with [`--inplace`](#opt) and [`--append`](#opt).
+
0. `--compare-dest=DIR`
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -269,7 +269,7 @@ enum msgcode {
+@@ -286,7 +286,7 @@ enum filetype {
#define NDX_DEL_STATS -3
#define NDX_FLIST_OFFSET -101
#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 */
-@@ -279,6 +279,7 @@ enum msgcode {
+@@ -296,6 +296,7 @@ enum filetype {
#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_FOR_BACKUP (1<<8) /* the delete is for a backup operation */
#define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
-diff --git a/util.c b/util.c
---- a/util.c
-+++ b/util.c
-@@ -182,7 +182,7 @@ int set_times(const char *fname, STRUCT_STAT *stp)
+diff --git a/util1.c b/util1.c
+--- a/util1.c
++++ b/util1.c
+@@ -184,7 +184,7 @@ int set_times(const char *fname, STRUCT_STAT *stp)
/* Create any necessary directories in fname. Any missing directories are
* created with default permissions. Returns < 0 on error, or the number
* of directories created. */
{
char *end, *p;
int ret = 0;
-@@ -213,7 +213,7 @@ int make_path(char *fname, int flags)
+@@ -215,7 +215,7 @@ int make_path(char *fname, int flags)
else
errno = ENOTDIR;
}
ret++;
break;
}
-@@ -252,7 +252,7 @@ int make_path(char *fname, int flags)
+@@ -254,7 +254,7 @@ int make_path(char *fname, int flags)
p += strlen(p);
if (ret < 0) /* Skip mkdir on error, but keep restoring the path. */
continue;
ret = -ret - 1;
else
ret++;
-@@ -1171,6 +1171,32 @@ char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
+@@ -1197,6 +1197,32 @@ char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
return path;
}
/**
* Return a quoted string with the full pathname of the indicated filename.
* The string " (in MODNAME)" may also be appended. The returned pointer
-@@ -1264,7 +1290,7 @@ int handle_partial_dir(const char *fname, int create)
+@@ -1290,7 +1316,7 @@ int handle_partial_dir(const char *fname, int create)
}
statret = -1;
}
git.samba.org / rsync-patches.git / blobdiff