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
Moved the new static internal functions from rsync.h to io.h.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
943e69d
..
ed23930
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-4,12
+4,11
@@
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002
, 2003, 2004, 2005, 2006
Wayne Davison
+ * Copyright (C) 2002
-2007
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,6
+22,7
@@
#include "rsync.h"
#include "rounding.h"
#include "rsync.h"
#include "rounding.h"
+#include "io.h"
extern int verbose;
extern int list_only;
extern int verbose;
extern int list_only;
@@
-30,7
+30,7
@@
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int am_sender;
extern int am_server;
extern int am_daemon;
extern int am_sender;
-extern int inc
remental
;
+extern int inc
_recurse
;
extern int do_progress;
extern int always_checksum;
extern int module_id;
extern int do_progress;
extern int always_checksum;
extern int module_id;
@@
-42,6
+42,7
@@
extern int filesfrom_fd;
extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
extern int one_file_system;
extern int copy_dirlinks;
extern int keep_dirlinks;
+extern int preserve_acls;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_devices;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_devices;
@@
-103,7
+104,7
@@
void init_flist(void)
static int show_filelist_p(void)
{
static int show_filelist_p(void)
{
- return verbose && xfer_dirs && !am_server && !inc
remental
;
+ return verbose && xfer_dirs && !am_server && !inc
_recurse
;
}
static void start_filelist_progress(char *kind)
}
static void start_filelist_progress(char *kind)
@@
-153,6
+154,8
@@
static void list_file_entry(struct file_struct *f)
permstring(permbuf, f->mode);
len = F_LENGTH(f);
permstring(permbuf, f->mode);
len = F_LENGTH(f);
+ /* TODO: indicate '+' if the entry has an ACL. */
+
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
@@
-392,7
+395,7
@@
static void send_file_entry(int f, struct file_struct *file, int ndx)
uid = F_UID(file);
if (preserve_uid && !numeric_ids) {
user_name = add_uid(uid);
uid = F_UID(file);
if (preserve_uid && !numeric_ids) {
user_name = add_uid(uid);
- if (inc
remental
&& user_name)
+ if (inc
_recurse
&& user_name)
flags |= XMIT_USER_NAME_FOLLOWS;
}
}
flags |= XMIT_USER_NAME_FOLLOWS;
}
}
@@
-404,7
+407,7
@@
static void send_file_entry(int f, struct file_struct *file, int ndx)
gid = F_GID(file);
if (preserve_gid && !numeric_ids) {
group_name = add_gid(gid);
gid = F_GID(file);
if (preserve_gid && !numeric_ids) {
group_name = add_gid(gid);
- if (inc
remental
&& group_name)
+ if (inc
_recurse
&& group_name)
flags |= XMIT_GROUP_NAME_FOLLOWS;
}
}
flags |= XMIT_GROUP_NAME_FOLLOWS;
}
}
@@
-465,13
+468,13
@@
static void send_file_entry(int f, struct file_struct *file, int ndx)
if (flags & XMIT_SAME_NAME)
write_byte(f, l1);
if (flags & XMIT_LONG_NAME)
if (flags & XMIT_SAME_NAME)
write_byte(f, l1);
if (flags & XMIT_LONG_NAME)
- write_
int
(f, l2);
+ write_
abbrevint30
(f, l2);
else
write_byte(f, l2);
write_buf(f, fname + l1, l2);
if (first_hlink_ndx >= 0) {
else
write_byte(f, l2);
write_buf(f, fname + l1, l2);
if (first_hlink_ndx >= 0) {
- write_
int
(f, first_hlink_ndx);
+ write_
abbrevint30
(f, first_hlink_ndx);
goto the_end;
}
goto the_end;
}
@@
-481,7
+484,7
@@
static void send_file_entry(int f, struct file_struct *file, int ndx)
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
- write_
int
(f, uid);
+ write_
abbrevint30
(f, uid);
if (flags & XMIT_USER_NAME_FOLLOWS) {
int len = strlen(user_name);
write_byte(f, len);
if (flags & XMIT_USER_NAME_FOLLOWS) {
int len = strlen(user_name);
write_byte(f, len);
@@
-489,7
+492,7
@@
static void send_file_entry(int f, struct file_struct *file, int ndx)
}
}
if (preserve_gid && !(flags & XMIT_SAME_GID)) {
}
}
if (preserve_gid && !(flags & XMIT_SAME_GID)) {
- write_
int
(f, gid);
+ write_
abbrevint30
(f, gid);
if (flags & XMIT_GROUP_NAME_FOLLOWS) {
int len = strlen(group_name);
write_byte(f, len);
if (flags & XMIT_GROUP_NAME_FOLLOWS) {
int len = strlen(group_name);
write_byte(f, len);
@@
-515,7
+518,7
@@
static void send_file_entry(int f, struct file_struct *file, int ndx)
if (preserve_links && S_ISLNK(mode)) {
const char *sl = F_SYMLINK(file);
int len = strlen(sl);
if (preserve_links && S_ISLNK(mode)) {
const char *sl = F_SYMLINK(file);
int len = strlen(sl);
- write_
int
(f, len);
+ write_
abbrevint30
(f, len);
write_buf(f, sl, len);
}
#endif
write_buf(f, sl, len);
}
#endif
@@
-581,7
+584,7
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
l1 = read_byte(f);
if (flags & XMIT_LONG_NAME)
l1 = read_byte(f);
if (flags & XMIT_LONG_NAME)
- l2 = read_
int
(f);
+ l2 = read_
abbrevint30
(f);
else
l2 = read_byte(f);
else
l2 = read_byte(f);
@@
-620,7
+623,7
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
if (protocol_version >= 30
&& BITS_SETnUNSET(flags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
struct file_struct *first;
if (protocol_version >= 30
&& BITS_SETnUNSET(flags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
struct file_struct *first;
- first_hlink_ndx = read_
int
(f);
+ first_hlink_ndx = read_
abbrevint30
(f);
if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) {
rprintf(FERROR,
"hard-link reference out of range: %d (%d)\n",
if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) {
rprintf(FERROR,
"hard-link reference out of range: %d (%d)\n",
@@
-658,17
+661,17
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
mode = tweak_mode(mode, chmod_modes);
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
mode = tweak_mode(mode, chmod_modes);
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
- uid = (uid_t)read_
int
(f);
+ uid = (uid_t)read_
abbrevint30
(f);
if (flags & XMIT_USER_NAME_FOLLOWS)
uid = recv_user_name(f, uid);
if (flags & XMIT_USER_NAME_FOLLOWS)
uid = recv_user_name(f, uid);
- else if (inc
remental
&& am_root && !numeric_ids)
+ else if (inc
_recurse
&& am_root && !numeric_ids)
uid = match_uid(uid);
}
if (preserve_gid && !(flags & XMIT_SAME_GID)) {
uid = match_uid(uid);
}
if (preserve_gid && !(flags & XMIT_SAME_GID)) {
- gid = (gid_t)read_
int
(f);
+ gid = (gid_t)read_
abbrevint30
(f);
if (flags & XMIT_GROUP_NAME_FOLLOWS)
gid = recv_group_name(f, gid);
if (flags & XMIT_GROUP_NAME_FOLLOWS)
gid = recv_group_name(f, gid);
- else if (inc
remental
&& (!am_root || !numeric_ids))
+ else if (inc
_recurse
&& (!am_root || !numeric_ids))
gid = match_gid(gid);
}
gid = match_gid(gid);
}
@@
-694,7
+697,7
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
- linkname_len = read_
int
(f) + 1; /* count the '\0' */
+ linkname_len = read_
abbrevint30
(f) + 1; /* count the '\0' */
if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
rprintf(FERROR, "overflow: linkname_len=%d\n",
linkname_len - 1);
if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
rprintf(FERROR, "overflow: linkname_len=%d\n",
linkname_len - 1);
@@
-715,6
+718,12
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
}
#endif
}
#endif
+#ifdef SUPPORT_ACLS
+ /* We need one or two index int32s when we're preserving ACLs. */
+ if (preserve_acls)
+ extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
+#endif
+
if (always_checksum && S_ISREG(mode))
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
if (always_checksum && S_ISREG(mode))
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
@@
-726,7
+735,7
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
#endif
extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
#endif
- if (inc
remental
&& S_ISDIR(mode)) {
+ if (inc
_recurse
&& S_ISDIR(mode)) {
if (one_file_system) {
/* Room to save the dir's device for -x */
extra_len += 2 * EXTRA_LEN;
if (one_file_system) {
/* Room to save the dir's device for -x */
extra_len += 2 * EXTRA_LEN;
@@
-852,6
+861,11
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
read_buf(f, bp, checksum_len);
}
read_buf(f, bp, checksum_len);
}
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !S_ISLNK(mode))
+ receive_acl(file, f);
+#endif
+
if (S_ISREG(mode) || S_ISLNK(mode))
stats.total_size += file_length;
if (S_ISREG(mode) || S_ISLNK(mode))
stats.total_size += file_length;
@@
-1099,7
+1113,7
@@
struct file_struct *make_file(const char *fname, struct file_list *flist,
if (basename_len == 0+1)
return NULL;
if (basename_len == 0+1)
return NULL;
- if (inc
remental
&& flist == dir_flist) {
+ if (inc
_recurse
&& flist == dir_flist) {
flist_expand(flist);
flist->files[flist->count++] = file;
}
flist_expand(flist);
flist->files[flist->count++] = file;
}
@@
-1123,6
+1137,9
@@
static struct file_struct *send_file_name(int f, struct file_list *flist,
int flags, int filter_flags)
{
struct file_struct *file;
int flags, int filter_flags)
{
struct file_struct *file;
+#ifdef SUPPORT_ACLS
+ statx sx;
+#endif
file = make_file(fname, flist, stp, flags, filter_flags);
if (!file)
file = make_file(fname, flist, stp, flags, filter_flags);
if (!file)
@@
-1131,12
+1148,28
@@
static struct file_struct *send_file_name(int f, struct file_list *flist,
if (chmod_modes && !S_ISLNK(file->mode))
file->mode = tweak_mode(file->mode, chmod_modes);
if (chmod_modes && !S_ISLNK(file->mode))
file->mode = tweak_mode(file->mode, chmod_modes);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !S_ISLNK(file->mode) && f >= 0) {
+ sx.st.st_mode = file->mode;
+ sx.acc_acl = sx.def_acl = NULL;
+ if (get_acl(fname, &sx) < 0)
+ return NULL;
+ }
+#endif
+
maybe_emit_filelist_progress(flist->count + flist_count_offset);
flist_expand(flist);
flist->files[flist->count++] = file;
maybe_emit_filelist_progress(flist->count + flist_count_offset);
flist_expand(flist);
flist->files[flist->count++] = file;
- if (f >= 0)
+ if (f >= 0)
{
send_file_entry(f, file, flist->count - 1);
send_file_entry(f, file, flist->count - 1);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !S_ISLNK(file->mode)) {
+ send_acl(&sx, f);
+ free_acl(&sx);
+ }
+#endif
+ }
return file;
}
return file;
}
@@
-1278,16
+1311,20
@@
void send_extra_file_list(int f, int at_least)
char fbuf[MAXPATHLEN];
struct file_list *flist;
int64 start_write;
char fbuf[MAXPATHLEN];
struct file_list *flist;
int64 start_write;
- int
past_and_prese
nt, save_io_error = io_error;
+ int
future_c
nt, save_io_error = io_error;
if (send_dir_ndx < 0)
return;
/* Keep sending data until we have the requested number of
* files in the upcoming file-lists. */
if (send_dir_ndx < 0)
return;
/* Keep sending data until we have the requested number of
* files in the upcoming file-lists. */
- past_and_present = cur_flist->ndx_start - first_flist->ndx_start
- + cur_flist->count;
- while (file_total - past_and_present < at_least) {
+ if (cur_flist->next) {
+ flist = first_flist->prev; /* the newest flist */
+ future_cnt = flist->count
+ + flist->ndx_start - cur_flist->next->ndx_start;
+ } else
+ future_cnt = 0;
+ while (future_cnt < at_least) {
struct file_struct *file = dir_flist->files[send_dir_ndx];
int32 *dp;
int dlen;
struct file_struct *file = dir_flist->files[send_dir_ndx];
int32 *dp;
int dlen;
@@
-1310,6
+1347,7
@@
void send_extra_file_list(int f, int at_least)
clean_flist(flist, 0, 0);
file_total += flist->count;
clean_flist(flist, 0, 0);
file_total += flist->count;
+ future_cnt += flist->count;
stats.flist_size += stats.total_written - start_write;
stats.num_files += flist->count;
if (verbose > 3)
stats.flist_size += stats.total_written - start_write;
stats.num_files += flist->count;
if (verbose > 3)
@@
-1355,7
+1393,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
rprintf(FLOG, "building file list\n");
if (show_filelist_p())
start_filelist_progress("building file list");
rprintf(FLOG, "building file list\n");
if (show_filelist_p())
start_filelist_progress("building file list");
- else if (inc
remental
&& verbose && !am_server)
+ else if (inc
_recurse
&& verbose && !am_server)
rprintf(FCLIENT, "sending incremental file list\n");
start_write = stats.total_written;
rprintf(FCLIENT, "sending incremental file list\n");
start_write = stats.total_written;
@@
-1367,7
+1405,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
#endif
flist = cur_flist = flist_new(0, "send_file_list");
#endif
flist = cur_flist = flist_new(0, "send_file_list");
- if (inc
remental
) {
+ if (inc
_recurse
) {
dir_flist = flist_new(FLIST_TEMP, "send_file_list");
flags = FLAG_DIVERT_DIRS;
} else {
dir_flist = flist_new(FLIST_TEMP, "send_file_list");
flags = FLAG_DIVERT_DIRS;
} else {
@@
-1543,7
+1581,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
if (fn != p || (*lp && *lp != '/')) {
int save_copy_links = copy_links;
int save_xfer_dirs = xfer_dirs;
if (fn != p || (*lp && *lp != '/')) {
int save_copy_links = copy_links;
int save_xfer_dirs = xfer_dirs;
- int dir_flags = inc
remental
? FLAG_DIVERT_DIRS : 0;
+ int dir_flags = inc
_recurse
? FLAG_DIVERT_DIRS : 0;
copy_links |= copy_unsafe_links;
xfer_dirs = 1;
while ((slash = strchr(slash+1, '/')) != 0) {
copy_links |= copy_unsafe_links;
xfer_dirs = 1;
while ((slash = strchr(slash+1, '/')) != 0) {
@@
-1567,10
+1605,10
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
struct file_struct *file;
int top_flags = FLAG_TOP_DIR | FLAG_XFER_DIR
| (is_dot_dir ? 0 : flags)
struct file_struct *file;
int top_flags = FLAG_TOP_DIR | FLAG_XFER_DIR
| (is_dot_dir ? 0 : flags)
- | (inc
remental
? FLAG_DIVERT_DIRS : 0);
+ | (inc
_recurse
? FLAG_DIVERT_DIRS : 0);
file = send_file_name(f, flist, fbuf, &st,
top_flags, ALL_FILTERS);
file = send_file_name(f, flist, fbuf, &st,
top_flags, ALL_FILTERS);
- if (file && !inc
remental
)
+ if (file && !inc
_recurse
)
send_if_directory(f, flist, file, fbuf, len, flags);
} else
send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS);
send_if_directory(f, flist, file, fbuf, len, flags);
} else
send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS);
@@
-1586,7
+1624,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
write_byte(f, 0); /* Indicate end of file list */
#ifdef SUPPORT_HARD_LINKS
write_byte(f, 0); /* Indicate end of file list */
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && protocol_version >= 30 && !inc
remental
)
+ if (preserve_hard_links && protocol_version >= 30 && !inc
_recurse
)
idev_destroy();
#endif
idev_destroy();
#endif
@@
-1602,10
+1640,10
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
* kept. For incremental mode, the sender also removes duplicates
* in this initial file-list so that it avoids re-sending duplicated
* directories. */
* kept. For incremental mode, the sender also removes duplicates
* in this initial file-list so that it avoids re-sending duplicated
* directories. */
- clean_flist(flist, 0, inc
remental
);
+ clean_flist(flist, 0, inc
_recurse
);
file_total += flist->count;
file_total += flist->count;
- if (!numeric_ids && !inc
remental
)
+ if (!numeric_ids && !inc
_recurse
)
send_uid_list(f);
/* send the io_error flag */
send_uid_list(f);
/* send the io_error flag */
@@
-1626,7
+1664,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
- if (inc
remental
) {
+ if (inc
_recurse
) {
add_dirs_to_tree(-1, 0, dir_flist->count - 1);
if (file_total == 1) {
/* If we're creating incremental file-lists and there
add_dirs_to_tree(-1, 0, dir_flist->count - 1);
if (file_total == 1) {
/* If we're creating incremental file-lists and there
@@
-1652,7
+1690,7
@@
struct file_list *recv_file_list(int f)
rprintf(FLOG, "receiving file list\n");
if (show_filelist_p())
start_filelist_progress("receiving file list");
rprintf(FLOG, "receiving file list\n");
if (show_filelist_p())
start_filelist_progress("receiving file list");
- else if (inc
remental
&& verbose && !am_server && !first_flist)
+ else if (inc
_recurse
&& verbose && !am_server && !first_flist)
rprintf(FCLIENT, "receiving incremental file list\n");
start_read = stats.total_read;
rprintf(FCLIENT, "receiving incremental file list\n");
start_read = stats.total_read;
@@
-1664,7
+1702,7
@@
struct file_list *recv_file_list(int f)
init_hard_links();
#endif
init_hard_links();
#endif
- if (inc
remental
) {
+ if (inc
_recurse
) {
if (flist->ndx_start == 0)
dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
dstart = dir_flist->count;
if (flist->ndx_start == 0)
dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
dstart = dir_flist->count;
@@
-1682,7
+1720,7
@@
struct file_list *recv_file_list(int f)
flags |= read_byte(f) << 8;
file = recv_file_entry(flist, flags, f);
flags |= read_byte(f) << 8;
file = recv_file_entry(flist, flags, f);
- if (inc
remental
&& S_ISDIR(file->mode)) {
+ if (inc
_recurse
&& S_ISDIR(file->mode)) {
flist_expand(dir_flist);
dir_flist->files[dir_flist->count++] = file;
}
flist_expand(dir_flist);
dir_flist->files[dir_flist->count++] = file;
}
@@
-1706,7
+1744,7
@@
struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
clean_flist(flist, relative_paths, 1);
- if (inc
remental
) {
+ if (inc
_recurse
) {
qsort(dir_flist->files + dstart, dir_flist->count - dstart,
sizeof dir_flist->files[0], (int (*)())file_compare);
} else if (f >= 0)
qsort(dir_flist->files + dstart, dir_flist->count - dstart,
sizeof dir_flist->files[0], (int (*)())file_compare);
} else if (f >= 0)