* 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
- * 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
#include "rsync.h"
#include "rounding.h"
+#include "io.h"
extern int verbose;
extern int list_only;
extern int am_server;
extern int am_daemon;
extern int am_sender;
-extern int incremental;
+extern int inc_recurse;
extern int do_progress;
extern int always_checksum;
extern int module_id;
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;
static int show_filelist_p(void)
{
- return verbose && xfer_dirs && !am_server && !incremental;
+ return verbose && xfer_dirs && !am_server && !inc_recurse;
}
static void start_filelist_progress(char *kind)
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",
return 1;
}
-static void send_file_entry(struct file_struct *file, int f, int ndx)
+static void send_file_entry(int f, struct file_struct *file, int ndx)
{
static time_t modtime;
static mode_t mode;
uid = F_UID(file);
if (preserve_uid && !numeric_ids) {
user_name = add_uid(uid);
- if (incremental && user_name)
+ if (inc_recurse && user_name)
flags |= XMIT_USER_NAME_FOLLOWS;
}
}
gid = F_GID(file);
if (preserve_gid && !numeric_ids) {
group_name = add_gid(gid);
- if (incremental && group_name)
+ if (inc_recurse && group_name)
flags |= XMIT_GROUP_NAME_FOLLOWS;
}
}
if (tmp_dev != 0) {
if (protocol_version >= 30) {
struct idev_node *np = idev_node(tmp_dev, tmp_ino);
- first_hlink_ndx = (int32)np->data - 1;
+ first_hlink_ndx = (int32)(long)np->data - 1;
if (first_hlink_ndx < 0) {
- np->data = (void*)(ndx + 1);
+ np->data = (void*)(long)(ndx + 1);
flags |= XMIT_HLINK_FIRST;
}
flags |= XMIT_HLINKED;
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) {
- write_int(f, first_hlink_ndx);
+ write_abbrevint30(f, first_hlink_ndx);
goto the_end;
}
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 (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 (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
the_end:
strlcpy(lastname, fname, MAXPATHLEN);
+
+ if (S_ISREG(mode) || S_ISLNK(mode))
+ stats.total_size += F_LENGTH(file);
}
static struct file_struct *recv_file_entry(struct file_list *flist,
l1 = read_byte(f);
if (flags & XMIT_LONG_NAME)
- l2 = read_int(f);
+ l2 = read_abbrevint30(f);
else
l2 = read_byte(f);
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",
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);
- else if (incremental && am_root && !numeric_ids)
+ else if (inc_recurse && am_root && !numeric_ids)
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);
- else if (incremental && (!am_root || !numeric_ids))
+ else if (inc_recurse && (!am_root || !numeric_ids))
gid = match_gid(gid);
}
#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);
}
#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;
extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
#endif
- if (incremental && 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;
}
file->mode = mode;
if (preserve_uid)
- F_UID(file) = uid;
+ F_OWNER(file) = uid;
if (preserve_gid)
- F_GID(file) = gid;
+ F_GROUP(file) = gid;
if (basename != thisname) {
file->dirname = lastdir;
ino = read_longint(f);
}
np = idev_node(dev, ino);
- ndx = (int32)np->data - 1;
+ ndx = (int32)(long)np->data - 1;
if (ndx < 0) {
ndx = cnt++;
- np->data = (void*)cnt;
+ np->data = (void*)(long)cnt;
}
F_HL_GNUM(file) = ndx;
}
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;
+
return file;
}
}
file->mode = st.st_mode;
if (preserve_uid)
- F_UID(file) = st.st_uid;
+ F_OWNER(file) = st.st_uid;
if (preserve_gid)
- F_GID(file) = st.st_gid;
+ F_GROUP(file) = st.st_gid;
if (basename != thisname)
file->dirname = lastdir;
file->len32 = 0;
file->mode = st2.st_mode;
if (preserve_uid)
- F_UID(file) = st2.st_uid;
+ F_OWNER(file) = st2.st_uid;
if (preserve_gid)
- F_GID(file) = st2.st_gid;
+ F_GROUP(file) = st2.st_gid;
} else
file->mode = save_mode;
}
- if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
- stats.total_size += st.st_size;
-
if (basename_len == 0+1)
return NULL;
- if (incremental && flist == dir_flist) {
+ if (inc_recurse && flist == dir_flist) {
flist_expand(flist);
flist->files[flist->count++] = file;
}
free(REQ_EXTRA(file, extra_cnt));
}
-static struct file_struct *send_file_name(struct file_list *flist,
+static struct file_struct *send_file_name(int f, struct file_list *flist,
char *fname, STRUCT_STAT *stp,
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)
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;
+ if (f >= 0) {
+ 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;
}
int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
int start = divert_dirs ? dir_flist->count : flist->count;
int filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
- struct file_struct *file;
assert(flist != NULL);
continue;
}
- file = send_file_name(flist, fbuf, NULL, flags, filter_flags);
- if (file && f >= 0)
- send_file_entry(file, f, flist->count - 1);
+ send_file_name(f, flist, fbuf, NULL, flags, filter_flags);
}
fbuf[len] = '\0';
char fbuf[MAXPATHLEN];
struct file_list *flist;
int64 start_write;
- int past_and_present, save_io_error = io_error;
+ int future_cnt, 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. */
- past_and_present = cur_flist->ndx_start - first_flist->ndx_start
- + cur_flist->count;
- while (file_total - past_and_present < at_least) {
- start_write = stats.total_written;
+ 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;
}
flist = flist_new(0, "send_extra_file_list");
+ start_write = stats.total_written;
- write_int(f, NDX_FLIST_OFFSET - send_dir_ndx);
+ write_ndx(f, NDX_FLIST_OFFSET - send_dir_ndx);
change_local_filter_dir(fbuf, dlen, send_dir_depth);
send_directory(f, flist, send_dir_ndx, fbuf, dlen, FLAG_DIVERT_DIRS | FLAG_XFER_DIR);
write_byte(f, 0);
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)
} else {
while (DIR_NEXT_SIBLING(dp) < 0) {
if ((send_dir_ndx = DIR_PARENT(dp)) < 0) {
- write_int(f, NDX_FLIST_EOF);
+ write_ndx(f, NDX_FLIST_EOF);
flist_eof = 1;
change_local_filter_dir(NULL, 0, 0);
goto finish;
char lastpath[MAXPATHLEN] = "";
struct file_list *flist;
struct timeval start_tv, end_tv;
- struct file_struct *file;
int64 start_write;
int use_ff_fd = 0;
int flags, disable_buffering;
rprintf(FLOG, "building file list\n");
if (show_filelist_p())
start_filelist_progress("building file list");
+ else if (inc_recurse && verbose && !am_server)
+ rprintf(FCLIENT, "sending incremental file list\n");
start_write = stats.total_written;
gettimeofday(&start_tv, NULL);
#endif
flist = cur_flist = flist_new(0, "send_file_list");
- if (incremental) {
+ if (inc_recurse) {
dir_flist = flist_new(FLIST_TEMP, "send_file_list");
flags = FLAG_DIVERT_DIRS;
} else {
if (fn != p || (*lp && *lp != '/')) {
int save_copy_links = copy_links;
int save_xfer_dirs = xfer_dirs;
- int dir_flags = incremental ? 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) {
*slash = '\0';
- file = send_file_name(flist, fbuf, NULL, dir_flags, ALL_FILTERS);
- if (file)
- send_file_entry(file, f, flist->count - 1);
+ send_file_name(f, flist, fbuf, NULL,
+ dir_flags, ALL_FILTERS);
*slash = '/';
}
copy_links = save_copy_links;
filesystem_dev = st.st_dev;
if (recurse || (xfer_dirs && is_dot_dir)) {
+ struct file_struct *file;
int top_flags = FLAG_TOP_DIR | FLAG_XFER_DIR
| (is_dot_dir ? 0 : flags)
- | (incremental ? FLAG_DIVERT_DIRS : 0);
- file = send_file_name(flist, fbuf, &st, top_flags, ALL_FILTERS);
- if (file) {
- send_file_entry(file, f, flist->count - 1);
- if (!incremental)
- send_if_directory(f, flist, file, fbuf, len, flags);
- }
- } else {
- file = send_file_name(flist, fbuf, &st, flags, ALL_FILTERS);
- if (file)
- send_file_entry(file, f, flist->count - 1);
- }
+ | (inc_recurse ? FLAG_DIVERT_DIRS : 0);
+ file = send_file_name(f, flist, fbuf, &st,
+ top_flags, ALL_FILTERS);
+ if (file && !inc_recurse)
+ send_if_directory(f, flist, file, fbuf, len, flags);
+ } else
+ send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS);
}
gettimeofday(&end_tv, NULL);
write_byte(f, 0); /* Indicate end of file list */
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && protocol_version >= 30 && !incremental)
+ if (preserve_hard_links && protocol_version >= 30 && !inc_recurse)
idev_destroy();
#endif
* 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, incremental);
+ clean_flist(flist, 0, inc_recurse);
file_total += flist->count;
- if (!numeric_ids && !incremental)
+ if (!numeric_ids && !inc_recurse)
send_uid_list(f);
/* send the io_error flag */
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
- if (incremental) {
+ 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
* was just 1 item in the first file-list, send 1 more
* file-list to check if this is a 1-file xfer. */
if (send_dir_ndx < 0)
- write_int(f, NDX_DONE);
+ write_ndx(f, NDX_DONE);
else
send_extra_file_list(f, 1);
}
int dstart, flags;
int64 start_read;
- if (f >= 0 && !incremental)
+ if (!first_flist)
rprintf(FLOG, "receiving file list\n");
if (show_filelist_p())
start_filelist_progress("receiving file list");
+ else if (inc_recurse && verbose && !am_server && !first_flist)
+ rprintf(FCLIENT, "receiving incremental file list\n");
start_read = stats.total_read;
init_hard_links();
#endif
- if (incremental) {
+ if (inc_recurse) {
if (flist->ndx_start == 0)
dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
dstart = dir_flist->count;
flags |= read_byte(f) << 8;
file = recv_file_entry(flist, flags, f);
- if (S_ISREG(file->mode) || S_ISLNK(file->mode))
- stats.total_size += F_LENGTH(file);
-
- if (incremental && S_ISDIR(file->mode)) {
+ if (inc_recurse && S_ISDIR(file->mode)) {
flist_expand(dir_flist);
dir_flist->files[dir_flist->count++] = file;
}
clean_flist(flist, relative_paths, 1);
- if (incremental) {
+ if (inc_recurse) {
qsort(dir_flist->files + dstart, dir_flist->count - dstart,
sizeof dir_flist->files[0], (int (*)())file_compare);
} else if (f >= 0)
void recv_additional_file_list(int f)
{
struct file_list *flist;
- int ndx = read_int(f);
+ int ndx = read_ndx(f);
if (ndx == NDX_DONE) {
flist_eof = 1;
change_local_filter_dir(NULL, 0, 0);
}
}
}
- /* Dump empty all remaining empty dirs. */
+ /* Dump all remaining empty dirs. */
while (1) {
struct file_struct *fp = flist->files[prev_i];
if (F_DEPTH(fp) >= 0)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff