Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set ignore_timeout before starting the transfer, regardless of
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
7e3ba7f
..
a1e5663
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-249,19
+249,24
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
if (link_stat(fbuf, &st, keep_dirlinks) < 0)
return;
if (link_stat(fbuf, &st, keep_dirlinks) < 0)
return;
- if (one_file_system && file->flags & FLAG_TOP_DIR)
- filesystem_dev = st.st_dev;
+ if (one_file_system) {
+ if (file->flags & FLAG_TOP_DIR)
+ filesystem_dev = st.st_dev;
+ else if (filesystem_dev != st.st_dev)
+ return;
+ }
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--; ) {
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--; ) {
- if (!dirlist->files[i]->basename)
+ struct file_struct *fp = dirlist->files[i];
+ if (!fp->basename)
continue;
continue;
- if (flist_find(flist,
dirlist->files[i]
) < 0) {
- int mode =
dirlist->files[i]
->mode;
- f_name_to(
dirlist->files[i]
, delbuf);
+ if (flist_find(flist,
fp
) < 0) {
+ int mode =
fp
->mode;
+ f_name_to(
fp
, delbuf);
if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
break;
}
if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
break;
}
@@
-829,7
+834,9
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
- if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_CHECK_MASTER))
return;
if (!S_ISREG(file->mode)) {
return;
if (!S_ISREG(file->mode)) {
@@
-912,12
+919,14
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (hard_link_one(file, ndx, fname, -1, &st,
fnamecmpbuf, 1,
itemizing && verbose > 1,
if (hard_link_one(file, ndx, fname, -1, &st,
fnamecmpbuf, 1,
itemizing && verbose > 1,
- code) == 0)
+ code) == 0) {
+ if (preserve_hard_links
+ && file->link_u.links) {
+ hard_link_cluster(file, ndx,
+ itemizing,
+ code);
+ }
return;
return;
- if (verbose) {
- rsyserr(FINFO, errno, "link %s => %s",
- full_fname(fnamecmpbuf),
- safe_fname(fname));
}
match_level = 2;
}
}
match_level = 2;
}
@@
-987,7
+996,9
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (statret != 0) {
}
if (statret != 0) {
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
goto notify_others;
return;
if (stat_errno == ENOENT)
goto notify_others;
@@
-1045,7
+1056,9
@@
prepare_to_open:
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
statret = real_ret = -1;
goto notify_others;
return;
statret = real_ret = -1;
goto notify_others;
@@
-1181,8
+1194,11
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
: "enabled");
}
: "enabled");
}
- if (protocol_version < 29)
- ignore_timeout = 1;
+ /* Since we often fill up the outgoing socket and then just sit around
+ * waiting for the other 2 processes to do their thing, we don't want
+ * to exit on a timeout. If the data stops flowing, the receiver will
+ * notice that and let us know via the redo pipe (or its closing). */
+ ignore_timeout = 1;
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
@@
-1228,10
+1244,6
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
ignore_times = 1;
make_backups = 0; /* avoid a duplicate backup for inplace processing */
ignore_times = 1;
make_backups = 0; /* avoid a duplicate backup for inplace processing */
- /* We expect to just sit around now, so don't exit on a timeout.
- * If we really get a timeout then the other process should exit. */
- ignore_timeout = 1;
-
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);