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
Make get_xattr_names() even safer at fetching the list of attr names.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
cc7a873
..
3616a8e
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-351,7
+351,7
@@
static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
static uint32 rdev_major;
static uid_t uid;
static gid_t gid;
static uint32 rdev_major;
static uid_t uid;
static gid_t gid;
- static char *user_name, *group_name;
+ static c
onst c
har *user_name, *group_name;
static char lastname[MAXPATHLEN];
char fname[MAXPATHLEN];
int first_hlink_ndx = -1;
static char lastname[MAXPATHLEN];
char fname[MAXPATHLEN];
int first_hlink_ndx = -1;
@@
-389,6
+389,7
@@
static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
/* Initialize starting value of xflags. */
if (protocol_version >= 30 && S_ISDIR(file->mode)) {
/* Initialize starting value of xflags. */
if (protocol_version >= 30 && S_ISDIR(file->mode)) {
+ dir_count++;
if (file->flags & FLAG_CONTENT_DIR)
xflags = file->flags & FLAG_TOP_DIR;
else if (file->flags & FLAG_IMPLIED_DIR)
if (file->flags & FLAG_CONTENT_DIR)
xflags = file->flags & FLAG_TOP_DIR;
else if (file->flags & FLAG_IMPLIED_DIR)
@@
-1291,8
+1292,6
@@
static struct file_struct *send_file_name(int f, struct file_list *flist,
flist_expand(flist, 1);
flist->files[flist->used++] = file;
if (f >= 0) {
flist_expand(flist, 1);
flist->files[flist->used++] = file;
if (f >= 0) {
- if (S_ISDIR(file->mode))
- dir_count++;
send_file_entry(f, file, flist->used - 1, flist->ndx_start);
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
send_file_entry(f, file, flist->used - 1, flist->ndx_start);
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
@@
-1526,8
+1525,10
@@
static void send_implied_dirs(int f, struct file_list *flist, char *fname,
relnamecache **rnpp;
char *slash;
int len, need_new_dir;
relnamecache **rnpp;
char *slash;
int len, need_new_dir;
+ struct filter_list_struct save_filter_list = filter_list;
flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR);
flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR);
+ filter_list.head = filter_list.tail = NULL; /* Don't filter implied dirs. */
if (inc_recurse) {
if (lastpath_struct && F_PATHNAME(lastpath_struct) == pathname
if (inc_recurse) {
if (lastpath_struct && F_PATHNAME(lastpath_struct) == pathname
@@
-1569,11
+1570,11
@@
static void send_implied_dirs(int f, struct file_list *flist, char *fname,
xfer_dirs = save_xfer_dirs;
if (!inc_recurse)
xfer_dirs = save_xfer_dirs;
if (!inc_recurse)
-
return
;
+
goto done
;
}
if (!lastpath_struct)
}
if (!lastpath_struct)
-
return
; /* dir must have vanished */
+
goto done
; /* dir must have vanished */
len = strlen(limit+1);
memcpy(&relname_list, F_DIR_RELNAMES_P(lastpath_struct), sizeof relname_list);
len = strlen(limit+1);
memcpy(&relname_list, F_DIR_RELNAMES_P(lastpath_struct), sizeof relname_list);
@@
-1587,6
+1588,9
@@
static void send_implied_dirs(int f, struct file_list *flist, char *fname,
out_of_memory("send_implied_dirs");
(*rnpp)->name_type = name_type;
strlcpy((*rnpp)->fname, limit+1, len + 1);
out_of_memory("send_implied_dirs");
(*rnpp)->name_type = name_type;
strlcpy((*rnpp)->fname, limit+1, len + 1);
+
+done:
+ filter_list = save_filter_list;
}
static void send1extra(int f, struct file_struct *file, struct file_list *flist)
}
static void send1extra(int f, struct file_struct *file, struct file_list *flist)
@@
-1831,7
+1835,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
} else if (!len || fbuf[len - 1] == '/') {
if (len == 2 && fbuf[0] == '.') {
/* Turn "./" into just "." rather than "./." */
} else if (!len || fbuf[len - 1] == '/') {
if (len == 2 && fbuf[0] == '.') {
/* Turn "./" into just "." rather than "./." */
- fbuf[
1
] = '\0';
+ fbuf[
--len
] = '\0';
} else {
if (len + 1 >= MAXPATHLEN)
overflow_exit("send_file_list");
} else {
if (len + 1 >= MAXPATHLEN)
overflow_exit("send_file_list");
@@
-1975,7
+1979,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
file = send_file_name(f, flist, fbuf, &st,
top_flags, ALL_FILTERS);
if (inc_recurse) {
file = send_file_name(f, flist, fbuf, &st,
top_flags, ALL_FILTERS);
if (inc_recurse) {
- if (name_type == DOT_NAME) {
+ if (name_type == DOT_NAME
&& file
) {
if (send_dir_depth < 0) {
send_dir_depth = 0;
change_local_filter_dir(fbuf, len, send_dir_depth);
if (send_dir_depth < 0) {
send_dir_depth = 0;
change_local_filter_dir(fbuf, len, send_dir_depth);