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
Added (conditional) include of stdint.h.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
7f2778a
..
60ce2ba
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;
}
@@
-1235,7
+1235,7
@@
static struct file_struct *send_file_name(int f, struct file_list *flist,
{
struct file_struct *file;
#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
{
struct file_struct *file;
#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
- statx sx;
+ stat
_
x sx;
#endif
file = make_file(fname, flist, stp, flags, filter_level);
#endif
file = make_file(fname, flist, stp, flags, filter_level);
@@
-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)
@@
-2392,6
+2389,8
@@
static void clean_flist(struct file_list *flist, int strip_root)
else {
if (am_sender)
file->flags |= FLAG_DUPLICATE;
else {
if (am_sender)
file->flags |= FLAG_DUPLICATE;
+ else /* Make sure we don't lose vital flags. */
+ fp->flags |= file->flags & (FLAG_TOP_DIR|FLAG_XFER_DIR);
keep = j, drop = i;
}
} else
keep = j, drop = i;
}
} else
@@
-2403,11
+2402,6
@@
static void clean_flist(struct file_list *flist, int strip_root)
"removing duplicate name %s from file list (%d)\n",
f_name(file, fbuf), drop + flist->ndx_start);
}
"removing duplicate name %s from file list (%d)\n",
f_name(file, fbuf), drop + flist->ndx_start);
}
- /* Make sure we don't lose track of a user-specified
- * top directory. */
- flist->sorted[keep]->flags |= flist->sorted[drop]->flags
- & (FLAG_TOP_DIR|FLAG_XFER_DIR);
-
clear_file(flist->sorted[drop]);
}
clear_file(flist->sorted[drop]);
}