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
New -x code had some problems, so restore the old code for now.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
af1e6a7
..
64b0c23
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-306,7
+306,7
@@
void flist_expand(struct file_list *flist)
out_of_memory("flist_expand");
}
out_of_memory("flist_expand");
}
-
void send_file_entry(struct file_struct *file, int f, unsigned short base_flags
)
+
static void send_file_entry(struct file_struct *file, int f
)
{
unsigned short flags;
static time_t modtime;
{
unsigned short flags;
static time_t modtime;
@@
-337,7
+337,7
@@
void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
f_name(file, fname);
f_name(file, fname);
- flags =
base_flags
;
+ flags =
file->flags & XMIT_TOP_DIR
;
if (file->mode == mode)
flags |= XMIT_SAME_MODE;
if (file->mode == mode)
flags |= XMIT_SAME_MODE;
@@
-569,6
+569,9
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
+ if (chmod_modes && !S_ISLNK(mode))
+ mode = tweak_mode(mode, chmod_modes);
+
if (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
if (preserve_gid && !(flags & XMIT_SAME_GID))
if (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
if (preserve_gid && !(flags & XMIT_SAME_GID))
@@
-733,7
+736,8
@@
static struct file_struct *receive_file_entry(struct file_list *flist,
* important case. Some systems may not have d_type.
**/
struct file_struct *make_file(char *fname, struct file_list *flist,
* important case. Some systems may not have d_type.
**/
struct file_struct *make_file(char *fname, struct file_list *flist,
- STRUCT_STAT *stp, int filter_level)
+ STRUCT_STAT *stp, unsigned short flags,
+ int filter_level)
{
static char *lastdir;
static int lastdir_len = -1;
{
static char *lastdir;
static int lastdir_len = -1;
@@
-744,7
+748,6
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
char linkname[MAXPATHLEN];
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
char *basename, *dirname, *bp;
char linkname[MAXPATHLEN];
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
char *basename, *dirname, *bp;
- unsigned short flags = 0;
if (!flist || !flist->count) /* Ignore lastdir when invalid. */
lastdir_len = -1;
if (!flist || !flist->count) /* Ignore lastdir when invalid. */
lastdir_len = -1;
@@
-806,8
+809,16
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
* into a mount-point directory, not to avoid copying a symlinked
* file if -L (or similar) was specified. */
if (one_file_system && st.st_dev != filesystem_dev
* into a mount-point directory, not to avoid copying a symlinked
* file if -L (or similar) was specified. */
if (one_file_system && st.st_dev != filesystem_dev
- && S_ISDIR(st.st_mode))
+ && S_ISDIR(st.st_mode)) {
+ if (one_file_system > 1) {
+ if (verbose > 2) {
+ rprintf(FINFO, "skipping mount-point dir %s\n",
+ thisname);
+ }
+ return NULL;
+ }
flags |= FLAG_MOUNT_POINT;
flags |= FLAG_MOUNT_POINT;
+ }
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
return NULL;
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
return NULL;
@@
-867,10
+878,7
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
- if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
- file->mode = tweak_mode(st.st_mode, chmod_modes);
- else
- file->mode = st.st_mode;
+ file->mode = st.st_mode;
file->uid = st.st_uid;
file->gid = st.st_gid;
file->uid = st.st_uid;
file->gid = st.st_gid;
@@
-933,7
+941,7
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
if (keep_dirlinks && linkname_len && flist) {
STRUCT_STAT st2;
int save_mode = file->mode;
if (keep_dirlinks && linkname_len && flist) {
STRUCT_STAT st2;
int save_mode = file->mode;
- file->mode = S_IFDIR; /*
find a directory w/our name
*/
+ file->mode = S_IFDIR; /*
Find a directory with our name.
*/
if (flist_find(the_file_list, file) >= 0
&& do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
file->modtime = st2.st_mtime;
if (flist_find(the_file_list, file) >= 0
&& do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
file->modtime = st2.st_mtime;
@@
-954,22
+962,25
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
static struct file_struct *send_file_name(int f, struct file_list *flist,
char *fname, STRUCT_STAT *stp,
static struct file_struct *send_file_name(int f, struct file_list *flist,
char *fname, STRUCT_STAT *stp,
- unsigned short
base_
flags)
+ unsigned short flags)
{
struct file_struct *file;
{
struct file_struct *file;
- file = make_file(fname, flist, stp,
+ file = make_file(fname, flist, stp,
flags,
f == -2 ? SERVER_FILTERS : ALL_FILTERS);
if (!file)
return NULL;
f == -2 ? SERVER_FILTERS : ALL_FILTERS);
if (!file)
return NULL;
+ if (chmod_modes && !S_ISLNK(file->mode))
+ file->mode = tweak_mode(file->mode, chmod_modes);
+
maybe_emit_filelist_progress(flist->count + flist_count_offset);
flist_expand(flist);
if (file->basename[0]) {
flist->files[flist->count++] = file;
maybe_emit_filelist_progress(flist->count + flist_count_offset);
flist_expand(flist);
if (file->basename[0]) {
flist->files[flist->count++] = file;
- send_file_entry(file, f
, base_flags
);
+ send_file_entry(file, f);
}
return file;
}
}
return file;
}
@@
-1268,7
+1279,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
if (recurse || (xfer_dirs && is_dot_dir)) {
struct file_struct *file;
if (recurse || (xfer_dirs && is_dot_dir)) {
struct file_struct *file;
- file = send_file_name(f, flist, fbuf, &st,
XMIT
_TOP_DIR);
+ file = send_file_name(f, flist, fbuf, &st,
FLAG
_TOP_DIR);
if (file)
send_if_directory(f, flist, file, fbuf, len);
} else
if (file)
send_if_directory(f, flist, file, fbuf, len);
} else
@@
-1292,7
+1303,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
stats.flist_buildtime = 1;
start_tv = end_tv;
stats.flist_buildtime = 1;
start_tv = end_tv;
- send_file_entry(NULL, f
, 0
);
+ send_file_entry(NULL, f);
if (show_filelist_p())
finish_filelist_progress(flist);
if (show_filelist_p())
finish_filelist_progress(flist);