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
When deleting files, we need to take any local FLAG_MOUNT_POINT
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
7e3ba7f
..
3077a13
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-210,7
+210,7
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
STRUCT_STAT st;
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
STRUCT_STAT st;
- int dlen, i;
+ int dlen, i
, j
;
if (!flist) {
while (cur_depth >= min_depth)
if (!flist) {
while (cur_depth >= min_depth)
@@
-226,6
+226,9
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
if (allowed_lull)
maybe_send_keepalive();
if (allowed_lull)
maybe_send_keepalive();
+ if (file->flags & FLAG_MOUNT_POINT)
+ return;
+
if (file->dir.depth >= MAXPATHLEN/2+1)
return; /* Impossible... */
if (file->dir.depth >= MAXPATHLEN/2+1)
return; /* Impossible... */
@@
-257,14
+260,16
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->count; i--; ) {
/* 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 (
(j = 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;
- }
+ } else if (fp->flags & FLAG_MOUNT_POINT)
+ flist->files[j]->flags |= FLAG_MOUNT_POINT;
}
flist_free(dirlist);
}
flist_free(dirlist);
@@
-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;