* 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 version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
extern int preserve_hard_links;
extern int preserve_devices;
extern int preserve_specials;
-extern int preserve_uid;
-extern int preserve_gid;
+extern int uid_ndx;
+extern int gid_ndx;
extern int relative_paths;
extern int implied_dirs;
extern int file_extra_cnt;
if (do_progress) {
/* This overwrites the progress line */
rprintf(FINFO, "%d file%sto consider\n",
- flist->count, flist->count == 1 ? " " : "s ");
+ flist->used, flist->used == 1 ? " " : "s ");
} else
rprintf(FINFO, "done\n");
}
static int pathname_len;
-/* Make sure flist can hold at least flist->count + extra entries. */
+/* Make sure flist can hold at least flist->used + extra entries. */
static void flist_expand(struct file_list *flist, int extra)
{
struct file_struct **new_ptr;
- if (flist->count + extra <= flist->malloced)
+ if (flist->used + extra <= flist->malloced)
return;
if (flist->malloced < FLIST_START)
/* In case count jumped or we are starting the list
* with a known size just set it. */
- if (flist->malloced < flist->count + extra)
- flist->malloced = flist->count + extra;
+ if (flist->malloced < flist->used + extra)
+ flist->malloced = flist->used + extra;
new_ptr = realloc_array(flist->files, struct file_struct *,
flist->malloced);
out_of_memory("flist_expand");
}
+static void flist_done_allocating(struct file_list *flist)
+{
+ void *ptr = pool_boundary(flist->file_pool, 8*1024);
+ if (flist->pool_boundary == ptr)
+ flist->pool_boundary = NULL; /* list didn't use any pool memory */
+ else
+ flist->pool_boundary = ptr;
+}
+
int push_pathname(const char *dir, int len)
{
if (dir == pathname)
}
} else if (protocol_version < 28)
rdev = MAKEDEV(0, 0);
- if (preserve_uid) {
+ if (uid_ndx) {
if ((uid_t)F_OWNER(file) == uid && *lastname)
flags |= XMIT_SAME_UID;
else {
uid = F_OWNER(file);
- if (preserve_uid && !numeric_ids) {
+ if (uid_ndx && !numeric_ids) {
user_name = add_uid(uid);
if (inc_recurse && user_name)
flags |= XMIT_USER_NAME_FOLLOWS;
}
}
}
- if (preserve_gid) {
+ if (gid_ndx) {
if ((gid_t)F_GROUP(file) == gid && *lastname)
flags |= XMIT_SAME_GID;
else {
gid = F_GROUP(file);
- if (preserve_gid && !numeric_ids) {
+ if (gid_ndx && !numeric_ids) {
group_name = add_gid(gid);
if (inc_recurse && group_name)
flags |= XMIT_GROUP_NAME_FOLLOWS;
}
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
- if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+ if (uid_ndx && !(flags & XMIT_SAME_UID)) {
if (protocol_version < 30)
write_int(f, uid);
else {
}
}
}
- if (preserve_gid && !(flags & XMIT_SAME_GID)) {
+ if (gid_ndx && !(flags & XMIT_SAME_GID)) {
if (protocol_version < 30)
write_int(f, gid);
else {
&& BITS_SETnUNSET(xflags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
struct file_struct *first;
first_hlink_ndx = read_varint30(f);
- if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) {
+ if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->used) {
rprintf(FERROR,
"hard-link reference out of range: %d (%d)\n",
- first_hlink_ndx, flist->count);
+ first_hlink_ndx, flist->used);
exit_cleanup(RERR_PROTOCOL);
}
first = flist->files[first_hlink_ndx];
file_length = F_LENGTH(first);
modtime = first->modtime;
mode = first->mode;
- if (preserve_uid)
+ if (uid_ndx)
uid = F_OWNER(first);
- if (preserve_gid)
+ if (gid_ndx)
gid = F_GROUP(first);
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
uint32 *devp = F_RDEV_P(first);
rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
- extra_len += 2 * EXTRA_LEN;
+ extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
}
if (preserve_links && S_ISLNK(mode))
linkname_len = strlen(F_SYMLINK(first)) + 1;
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
- if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
+ if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
uid = (uid_t)read_int(f);
else {
uid = match_uid(uid);
}
}
- if (preserve_gid && !(xflags & XMIT_SAME_GID)) {
+ if (gid_ndx && !(xflags & XMIT_SAME_GID)) {
if (protocol_version < 30)
gid = (gid_t)read_int(f);
else {
rdev_minor = read_int(f);
rdev = MAKEDEV(rdev_major, rdev_minor);
}
- extra_len += 2 * EXTRA_LEN;
+ extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
file_length = 0;
} else if (protocol_version < 28)
rdev = MAKEDEV(0, 0);
if (inc_recurse && S_ISDIR(mode)) {
if (one_file_system) {
/* Room to save the dir's device for -x */
- extra_len += 2 * EXTRA_LEN;
+ extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
}
pool = dir_flist->file_pool;
} else
OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
}
file->mode = mode;
- if (preserve_uid)
+ if (uid_ndx)
F_OWNER(file) = uid;
- if (preserve_gid) {
+ if (gid_ndx) {
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
#ifdef ICONV_OPTION
if (ic_ndx)
- F_NDX(file) = flist->count + flist->ndx_start;
+ F_NDX(file) = flist->used + flist->ndx_start;
#endif
if (basename != thisname) {
if (preserve_hard_links && xflags & XMIT_HLINKED) {
if (protocol_version >= 30) {
F_HL_GNUM(file) = xflags & XMIT_HLINK_FIRST
- ? flist->count : first_hlink_ndx;
+ ? flist->used : first_hlink_ndx;
} else {
static int32 cnt = 0;
struct idev_node *np;
if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
if (S_ISREG(mode))
- bp = (char*)F_SUM(file);
+ bp = F_SUM(file);
else {
/* Prior to 28, we get a useless set of nulls. */
bp = tmp_sum;
alloc_pool_t *pool;
char *bp;
- if (strlcpy(thisname, fname, sizeof thisname)
- >= sizeof thisname - pathname_len) {
+ if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
rprintf(FINFO, "skipping overly long name: %s\n", fname);
return NULL;
}
if (flist->prev && S_ISDIR(st.st_mode)
&& flags & FLAG_DIVERT_DIRS) {
/* Room for parent/sibling/next-child info. */
- extra_len += 3 * EXTRA_LEN;
+ extra_len += DIRNODE_EXTRA_CNT * EXTRA_LEN;
dir_count++;
pool = dir_flist->file_pool;
} else
OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
}
file->mode = st.st_mode;
- if (preserve_uid)
+ if (uid_ndx)
F_OWNER(file) = st.st_uid;
- if (preserve_gid)
+ if (gid_ndx)
F_GROUP(file) = st.st_gid;
if (basename != thisname)
file->modtime = st2.st_mtime;
file->len32 = 0;
file->mode = st2.st_mode;
- if (preserve_uid)
+ if (uid_ndx)
F_OWNER(file) = st2.st_uid;
- if (preserve_gid)
+ if (gid_ndx)
F_GROUP(file) = st2.st_gid;
} else
file->mode = save_mode;
static struct file_struct *send_file_name(int f, struct file_list *flist,
char *fname, STRUCT_STAT *stp,
- int flags, int filter_flags)
+ int flags, int filter_level)
{
struct file_struct *file;
#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
statx sx;
#endif
- file = make_file(fname, flist, stp, flags, filter_flags);
+ file = make_file(fname, flist, stp, flags, filter_level);
if (!file)
return NULL;
}
#endif
- maybe_emit_filelist_progress(flist->count + flist_count_offset);
+ maybe_emit_filelist_progress(flist->used + flist_count_offset);
flist_expand(flist, 1);
- flist->files[flist->count++] = file;
+ flist->files[flist->used++] = file;
if (f >= 0) {
- send_file_entry(f, file, flist->count - 1);
+ send_file_entry(f, file, flist->used - 1);
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
send_acl(&sx, f);
int i;
int32 *dp = NULL;
int32 *parent_dp = parent_ndx < 0 ? NULL
- : F_DIRNODE_P(dir_flist->sorted[parent_ndx]);
+ : F_DIR_NODE_P(dir_flist->sorted[parent_ndx]);
flist_expand(dir_flist, dir_cnt);
dir_flist->sorted = dir_flist->files;
if (!S_ISDIR(file->mode))
continue;
- dir_flist->files[dir_flist->count++] = file;
+ dir_flist->files[dir_flist->used++] = file;
dir_cnt--;
if (!(file->flags & FLAG_XFER_DIR)
continue;
if (dp)
- DIR_NEXT_SIBLING(dp) = dir_flist->count - 1;
+ DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
else if (parent_dp)
- DIR_FIRST_CHILD(parent_dp) = dir_flist->count - 1;
+ DIR_FIRST_CHILD(parent_dp) = dir_flist->used - 1;
else
- send_dir_ndx = dir_flist->count - 1;
+ send_dir_ndx = dir_flist->used - 1;
- dp = F_DIRNODE_P(file);
+ dp = F_DIR_NODE_P(file);
DIR_PARENT(dp) = parent_ndx;
DIR_FIRST_CHILD(dp) = -1;
}
char *p;
DIR *d;
int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
- int start = flist->count;
- int filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
+ int start = flist->used;
+ int filter_level = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
assert(flist != NULL);
continue;
}
- send_file_name(f, flist, fbuf, NULL, flags, filter_flags);
+ send_file_name(f, flist, fbuf, NULL, flags, filter_level);
}
fbuf[len] = '\0';
closedir(d);
if (f >= 0 && recurse && !divert_dirs) {
- int i, end = flist->count - 1;
- /* send_if_directory() bumps flist->count, so use "end". */
+ int i, end = flist->used - 1;
+ /* send_if_directory() bumps flist->used, so use "end". */
for (i = start; i <= end; i++)
send_if_directory(f, flist, flist->files[i], fbuf, len, flags);
}
* files in the upcoming file-lists. */
if (cur_flist->next) {
flist = first_flist->prev; /* the newest flist */
- future_cnt = flist->count + flist->ndx_start
- - cur_flist->next->ndx_start;
+ future_cnt = flist->ndx_end - cur_flist->next->ndx_start + 1;
} else
future_cnt = 0;
while (future_cnt < at_least) {
#endif
dir_ndx = send_dir_ndx;
write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
+ flist->parent_ndx = dir_ndx;
send1extra(f, file, flist);
- dp = F_DIRNODE_P(file);
+ dp = F_DIR_NODE_P(file);
/* If there are any duplicate directory names that follow, we
* send all the dirs together in one file-list. The dir_flist
send_dir_ndx = dir_ndx;
file = dir_flist->sorted[dir_ndx];
send1extra(f, file, flist);
- dp = F_DIRNODE_P(file);
+ dp = F_DIR_NODE_P(file);
}
write_byte(f, 0);
#ifdef ICONV_OPTION
if (need_unsorted_flist) {
- if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+ if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
out_of_memory("send_extra_file_list");
memcpy(flist->sorted, flist->files,
- flist->count * sizeof (struct file_struct*));
+ flist->used * sizeof (struct file_struct*));
} else
#endif
flist->sorted = flist->files;
clean_flist(flist, 0);
+ flist->ndx_end = flist->ndx_start + flist->used - 1
+ - (dir_count - dstart);
+
add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart);
+ flist_done_allocating(flist);
- file_total += flist->count;
- future_cnt += flist->count;
+ file_total += flist->used;
+ future_cnt += flist->used;
stats.flist_size += stats.total_written - start_write;
- stats.num_files += flist->count;
+ stats.num_files += flist->used;
if (verbose > 3)
output_flist(flist);
}
send_dir_depth--;
file = dir_flist->sorted[send_dir_ndx];
- dp = F_DIRNODE_P(file);
+ dp = F_DIR_NODE_P(file);
}
send_dir_ndx = DIR_NEXT_SIBLING(dp);
}
#ifdef ICONV_OPTION
if (need_unsorted_flist) {
if (inc_recurse) {
- if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+ if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
out_of_memory("send_file_list");
memcpy(flist->sorted, flist->files,
- flist->count * sizeof (struct file_struct*));
+ flist->used * sizeof (struct file_struct*));
clean_flist(flist, 0);
- } else
+ } else {
flist->sorted = flist->files;
+ flist->low = 0;
+ flist->high = flist->used - 1;
+ }
} else
#endif
{
flist->sorted = flist->files;
clean_flist(flist, 0);
}
- file_total += flist->count;
+ file_total += flist->used;
+
+ /* We don't subtract dir_count for the first send since we
+ * might have one or more dot dirs which need to get sent. */
+ flist->ndx_end = flist->ndx_start + flist->used - 1;
if (!numeric_ids && !inc_recurse)
send_id_list(f);
io_end_buffering_out();
stats.flist_size = stats.total_written - start_write;
- stats.num_files = flist->count;
+ stats.num_files = flist->used;
if (verbose > 3)
output_flist(flist);
if (inc_recurse) {
add_dirs_to_tree(-1, flist, dir_count);
+ flist_done_allocating(flist);
if (send_dir_ndx < 0) {
write_ndx(f, NDX_FLIST_EOF);
flist_eof = 1;
if (inc_recurse) {
if (flist->ndx_start == 0)
dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
- dstart = dir_flist->count;
+ dstart = dir_flist->used;
} else {
dir_flist = flist;
dstart = 0;
if (inc_recurse && S_ISDIR(file->mode)) {
flist_expand(dir_flist, 1);
- dir_flist->files[dir_flist->count++] = file;
+ dir_flist->files[dir_flist->used++] = file;
}
- flist->files[flist->count++] = file;
+ flist->files[flist->used++] = file;
- maybe_emit_filelist_progress(flist->count);
+ maybe_emit_filelist_progress(flist->used);
if (verbose > 2) {
rprintf(FINFO, "recv_file_name(%s)\n",
f_name(file, NULL));
}
}
- file_total += flist->count;
+ file_total += flist->used;
+
+ flist->ndx_end = flist->ndx_start + flist->used - 1;
+ if (inc_recurse && flist->ndx_start)
+ flist->ndx_end -= dir_flist->used - dstart;
if (verbose > 2)
- rprintf(FINFO, "received %d names\n", flist->count);
+ rprintf(FINFO, "received %d names\n", flist->used);
if (show_filelist_p())
finish_filelist_progress(flist);
* order and for calling flist_find()). We keep the "files"
* list unsorted for our exchange of index numbers with the
* other side (since their names may not sort the same). */
- if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+ if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
out_of_memory("recv_file_list");
memcpy(flist->sorted, flist->files,
- flist->count * sizeof (struct file_struct*));
- if (inc_recurse && dir_flist->count > dstart) {
+ flist->used * sizeof (struct file_struct*));
+ if (inc_recurse && dir_flist->used > dstart) {
dir_flist->sorted = realloc_array(dir_flist->sorted,
struct file_struct *,
- dir_flist->count);
+ dir_flist->used);
memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart,
- (dir_flist->count - dstart) * sizeof (struct file_struct*));
- fsort(dir_flist->sorted + dstart, dir_flist->count - dstart);
+ (dir_flist->used - dstart) * sizeof (struct file_struct*));
+ fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
}
} else
#endif
{
flist->sorted = flist->files;
- if (inc_recurse && dir_flist->count > dstart) {
+ if (inc_recurse && dir_flist->used > dstart) {
dir_flist->sorted = dir_flist->files;
- fsort(dir_flist->sorted + dstart, dir_flist->count - dstart);
+ fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
}
}
- if (!inc_recurse && f >= 0)
+ if (inc_recurse)
+ flist_done_allocating(flist);
+ else if (f >= 0)
recv_id_list(f, flist);
clean_flist(flist, relative_paths);
if (list_only) {
int i;
- for (i = 0; i < flist->count; i++)
+ for (i = flist->low; i <= flist->high; i++)
list_file_entry(flist->files[i]);
}
rprintf(FINFO, "recv_file_list done\n");
stats.flist_size += stats.total_read - start_read;
- stats.num_files += flist->count;
+ stats.num_files += flist->used;
return flist;
}
change_local_filter_dir(NULL, 0, 0);
} else {
ndx = NDX_FLIST_OFFSET - ndx;
- if (ndx < 0 || ndx >= dir_flist->count) {
+ if (ndx < 0 || ndx >= dir_flist->used) {
ndx = NDX_FLIST_OFFSET - ndx;
rprintf(FERROR,
"[%s] Invalid dir index: %d (%d - %d)\n",
who_am_i(), ndx, NDX_FLIST_OFFSET,
- NDX_FLIST_OFFSET - dir_flist->count + 1);
+ NDX_FLIST_OFFSET - dir_flist->used + 1);
exit_cleanup(RERR_PROTOCOL);
}
if (verbose > 3) {
memset(flist, 0, sizeof flist[0]);
- if (!(flags & FLIST_TEMP)) {
- if (first_flist) {
- flist->ndx_start = first_flist->prev->ndx_start
- + first_flist->prev->count;
- }
+ if (flags & FLIST_TEMP) {
+ if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0,
+ out_of_memory, POOL_INTERN)))
+ out_of_memory(msg);
+ } else {
/* This is a doubly linked list with prev looping back to
* the end of the list, but the last next pointer is NULL. */
- if (!first_flist)
+ if (!first_flist) {
+ flist->file_pool = pool_create(NORMAL_EXTENT, 0,
+ out_of_memory, POOL_INTERN);
+ if (!flist->file_pool)
+ out_of_memory(msg);
+
first_flist = cur_flist = flist->prev = flist;
- else {
+ } else {
+ flist->file_pool = first_flist->file_pool;
+
+ flist->ndx_start = first_flist->prev->ndx_end + 2;
+
flist->prev = first_flist->prev;
flist->prev->next = first_flist->prev = flist;
}
+ flist->pool_boundary = pool_boundary(flist->file_pool, 0);
flist_cnt++;
}
- if (!(flist->file_pool = pool_create(FILE_EXTENT, 0, out_of_memory, POOL_INTERN)))
- out_of_memory(msg);
-
return flist;
}
/* Free up all elements in a flist. */
void flist_free(struct file_list *flist)
{
- if (!flist->prev)
- ; /* Was FLIST_TEMP dir-list. */
- else if (flist == flist->prev) {
+ if (!flist->prev) {
+ /* Was FLIST_TEMP dir-list. */
+ } else if (flist == flist->prev) {
first_flist = cur_flist = NULL;
file_total = 0;
flist_cnt = 0;
flist->next = first_flist;
}
flist->next->prev = flist->prev;
- file_total -= flist->count;
+ file_total -= flist->used;
flist_cnt--;
}
- pool_destroy(flist->file_pool);
+ if (!flist->prev || !flist_cnt)
+ pool_destroy(flist->file_pool);
+ else
+ pool_free_old(flist->file_pool, flist->pool_boundary);
+
if (flist->sorted && flist->sorted != flist->files)
free(flist->sorted);
free(flist->files);
if (!flist)
return;
- if (flist->count == 0) {
+ if (flist->used == 0) {
flist->high = -1;
+ flist->low = 0;
return;
}
- fsort(flist->sorted, flist->count);
+ fsort(flist->sorted, flist->used);
if (!am_sender || inc_recurse) {
- for (i = prev_i = 0; i < flist->count; i++) {
+ for (i = prev_i = 0; i < flist->used; i++) {
if (F_IS_ACTIVE(flist->sorted[i])) {
prev_i = i;
break;
}
flist->low = prev_i;
} else {
- i = prev_i = flist->count - 1;
+ i = prev_i = flist->used - 1;
flist->low = 0;
}
- while (++i < flist->count) {
+ while (++i < flist->used) {
int j;
struct file_struct *file = flist->sorted[i];
const char *who = who_am_i();
int i;
- rprintf(FINFO, "[%s] flist start=%d, count=%d, low=%d, high=%d\n",
- who, flist->ndx_start, flist->count, flist->low, flist->high);
- for (i = 0; i < flist->count; i++) {
+ rprintf(FINFO, "[%s] flist start=%d, end=%d, used=%d, low=%d, high=%d\n",
+ who, flist->ndx_start, flist->ndx_end, flist->used, flist->low, flist->high);
+ for (i = 0; i < flist->used; i++) {
file = flist->sorted[i];
- if ((am_root || am_sender) && preserve_uid) {
+ if ((am_root || am_sender) && uid_ndx) {
snprintf(uidbuf, sizeof uidbuf, " uid=%u",
F_OWNER(file));
} else
*uidbuf = '\0';
- if (preserve_gid) {
+ if (gid_ndx) {
static char parens[] = "(\0)\0\0\0";
char *pp = parens + (file->flags & FLAG_SKIP_GROUP ? 0 : 3);
snprintf(gidbuf, sizeof gidbuf, " gid=%s%u%s",
char dirbuf[MAXPATHLEN];
int save_recurse = recurse;
int save_xfer_dirs = xfer_dirs;
+ int save_prune_empty_dirs = prune_empty_dirs;
if (dlen < 0) {
dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
xfer_dirs = save_xfer_dirs;
recurse = save_recurse;
if (do_progress)
- flist_count_offset += dirlist->count;
+ flist_count_offset += dirlist->used;
+ prune_empty_dirs = 0;
dirlist->sorted = dirlist->files;
clean_flist(dirlist, 0);
+ prune_empty_dirs = save_prune_empty_dirs;
if (verbose > 3)
output_flist(dirlist);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff