Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5a47354
)
Fixed a glitch in the sending of mount-point dirs in inc_recurse mode.
author
Wayne Davison
<wayned@samba.org>
Sun, 23 Sep 2007 21:46:51 +0000
(21:46 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 23 Sep 2007 21:46:51 +0000
(21:46 +0000)
flist.c
patch
|
blob
|
blame
|
history
diff --git
a/flist.c
b/flist.c
index
57d1596
..
a30616f
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-1049,10
+1049,10
@@
struct file_struct *make_file(const char *fname, struct file_list *flist,
filesystem_dev = st.st_dev;
else if (st.st_dev != filesystem_dev) {
if (one_file_system > 1) {
filesystem_dev = st.st_dev;
else if (st.st_dev != filesystem_dev) {
if (one_file_system > 1) {
- if (verbose >
2
) {
+ if (verbose >
1
) {
rprintf(FINFO,
rprintf(FINFO,
- "skipping mount-point dir %s\n",
- thisname);
+ "
[%s]
skipping mount-point dir %s\n",
+
who_am_i(),
thisname);
}
return NULL;
}
}
return NULL;
}
@@
-1399,9
+1399,6
@@
static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
dir_flist->files[dir_flist->used++] = file;
dir_cnt--;
dir_flist->files[dir_flist->used++] = file;
dir_cnt--;
- if (file->flags & FLAG_MOUNT_DIR)
- continue;
-
if (dp)
DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
else if (parent_dp)
if (dp)
DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
else if (parent_dp)
@@
-1579,7
+1576,7
@@
static void send1extra(int f, struct file_struct *file, struct file_list *flist)
change_local_filter_dir(fbuf, dlen, send_dir_depth);
change_local_filter_dir(fbuf, dlen, send_dir_depth);
- if (
file->flags & FLAG_XFER_DIR
)
+ if (
BITS_SETnUNSET(file->flags, FLAG_XFER_DIR, FLAG_MOUNT_DIR)
)
send_directory(f, flist, fbuf, dlen, flags);
if (!relative_paths)
send_directory(f, flist, fbuf, dlen, flags);
if (!relative_paths)