extern int preserve_gid;
extern int relative_paths;
extern int implied_dirs;
+extern int flist_extra_cnt;
+extern int ignore_perishable;
+extern int non_perishable_cnt;
extern int prune_empty_dirs;
extern int copy_links;
extern int copy_unsafe_links;
extern int sanitize_paths;
extern struct stats stats;
extern struct file_list *the_file_list;
+extern alloc_pool_t hlink_pool;
extern char curr_dir[MAXPATHLEN];
int io_error;
int checksum_len;
dev_t filesystem_dev; /* used to implement -x */
-unsigned int file_struct_len;
+
+/* The tmp_* vars are used as a cache area by make_file() to store data
+ * that the sender doesn't need to remember in its file list. The data
+ * will survive just long enough to be used by send_file_entry(). */
+static dev_t tmp_rdev;
+#ifdef SUPPORT_HARD_LINKS
+static struct idev tmp_idev;
+#endif
+static char tmp_sum[MD4_SUM_LENGTH];
static char empty_sum[MD4_SUM_LENGTH];
-static int flist_count_offset;
+static int flist_count_offset; /* for --delete --progress */
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
static void output_flist(struct file_list *flist);
void init_flist(void)
{
- struct file_struct f;
-
- /* Figure out how big the file_struct is without trailing padding */
- file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
+ if (verbose > 4) {
+ rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n",
+ (int)FILE_STRUCT_LEN, (int)EXTRA_LEN);
+ }
checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
}
static void list_file_entry(struct file_struct *f)
{
char permbuf[PERMSTRING_SIZE];
+ double len;
- if (!f->basename) {
+ if (!F_IS_ACTIVE(f)) {
/* this can happen if duplicate names were removed */
return;
}
permstring(permbuf, f->mode);
+ len = F_LENGTH(f);
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
- permbuf,
- (double)f->length, timestring(f->modtime),
- f_name(f, NULL), f->u.link);
+ permbuf, len, timestring(f->modtime),
+ f_name(f, NULL), F_SYMLINK(f));
} else
#endif
{
rprintf(FINFO, "%s %11.0f %s %s\n",
- permbuf,
- (double)f->length, timestring(f->modtime),
+ permbuf, len, timestring(f->modtime),
f_name(f, NULL));
}
}
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len);
-static char *flist_dir;
+static const char *flist_dir;
static int flist_dir_len;
f_name(file, fname);
- flags = file->flags & XMIT_TOP_DIR;
+ flags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
if (file->mode == mode)
flags |= XMIT_SAME_MODE;
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
- if (file->u.rdev == rdev)
+ if (tmp_rdev == rdev)
flags |= XMIT_SAME_RDEV_pre28;
else
- rdev = file->u.rdev;
+ rdev = tmp_rdev;
} else {
- rdev = file->u.rdev;
+ rdev = tmp_rdev;
if ((uint32)major(rdev) == rdev_major)
flags |= XMIT_SAME_RDEV_MAJOR;
else
}
} else if (protocol_version < 28)
rdev = MAKEDEV(0, 0);
- if (file->uid == uid)
- flags |= XMIT_SAME_UID;
- else
- uid = file->uid;
- if (file->gid == gid)
- flags |= XMIT_SAME_GID;
- else
- gid = file->gid;
+ if (preserve_uid) {
+ if (F_UID(file) == uid)
+ flags |= XMIT_SAME_UID;
+ else
+ uid = F_UID(file);
+ }
+ if (preserve_gid) {
+ if (F_GID(file) == gid)
+ flags |= XMIT_SAME_GID;
+ else
+ gid = F_GID(file);
+ }
if (file->modtime == modtime)
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
#ifdef SUPPORT_HARD_LINKS
- if (file->link_u.idev) {
- if (file->F_DEV == dev) {
+ if (tmp_idev.dev != 0) {
+ if (tmp_idev.dev == dev) {
if (protocol_version >= 28)
flags |= XMIT_SAME_DEV;
} else
- dev = file->F_DEV;
- flags |= XMIT_HAS_IDEV_DATA;
+ dev = tmp_idev.dev;
+ flags |= XMIT_HLINKED;
}
#endif
flags |= XMIT_TOP_DIR;
if ((flags & 0xFF00) || !flags) {
flags |= XMIT_EXTENDED_FLAGS;
- write_byte(f, flags);
- write_byte(f, flags >> 8);
+ write_shortint(f, flags);
} else
write_byte(f, flags);
} else {
write_byte(f, l2);
write_buf(f, fname + l1, l2);
- write_longint(f, file->length);
+ write_longint(f, F_LENGTH(file));
if (!(flags & XMIT_SAME_TIME))
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
- int len = strlen(file->u.link);
+ const char *sl = F_SYMLINK(file);
+ int len = strlen(sl);
write_int(f, len);
- write_buf(f, file->u.link, len);
+ write_buf(f, sl, len);
}
#endif
#ifdef SUPPORT_HARD_LINKS
- if (file->link_u.idev) {
+ if (tmp_idev.dev != 0) {
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
- write_int(f, dev);
- write_int(f, file->F_INODE);
+ write_int(f, (int32)dev);
+ write_int(f, (int32)tmp_idev.ino);
} else {
/* 64-bit dev_t and ino_t */
if (!(flags & XMIT_SAME_DEV))
write_longint(f, dev);
- write_longint(f, file->F_INODE);
+ write_longint(f, tmp_idev.ino);
}
}
#endif
if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
- char *sum;
+ const char *sum;
if (S_ISREG(mode))
- sum = file->u.sum;
+ sum = tmp_sum;
else {
/* Prior to 28, we sent a useless set of nulls. */
sum = empty_sum;
strlcpy(lastname, fname, MAXPATHLEN);
}
-static struct file_struct *receive_file_entry(struct file_list *flist,
- unsigned short flags, int f)
+static struct file_struct *recv_file_entry(struct file_list *flist,
+ unsigned short flags, int f)
{
static time_t modtime;
static mode_t mode;
static int in_del_hier = 0;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
- int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+ int alloc_len, basename_len, dirname_len, linkname_len;
+ int extra_len = (flist_extra_cnt - 1) * EXTRA_LEN;
OFF_T file_length;
char *basename, *dirname, *bp;
struct file_struct *file;
if (l2 >= MAXPATHLEN - l1) {
rprintf(FERROR,
- "overflow: flags=0x%x l1=%d l2=%d lastname=%s\n",
- flags, l1, l2, lastname);
- overflow_exit("receive_file_entry");
+ "overflow: flags=0x%x l1=%d l2=%d lastname=%s [%s]\n",
+ flags, l1, l2, lastname, who_am_i());
+ overflow_exit("recv_file_entry");
}
strlcpy(thisname, lastname, l1 + 1);
rdev_minor = read_int(f);
rdev = MAKEDEV(rdev_major, rdev_minor);
}
+ extra_len += 2 * EXTRA_LEN;
+ file_length = 0;
} else if (protocol_version < 28)
rdev = MAKEDEV(0, 0);
if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
rprintf(FERROR, "overflow: linkname_len=%d\n",
linkname_len - 1);
- overflow_exit("receive_file_entry");
+ overflow_exit("recv_file_entry");
}
}
else
#endif
linkname_len = 0;
- sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
+#ifdef SUPPORT_HARD_LINKS
+ if (preserve_hard_links) {
+ if (protocol_version < 28 && S_ISREG(mode))
+ flags |= XMIT_HLINKED;
+ if (flags & XMIT_HLINKED)
+ extra_len += EXTRA_LEN;
+ }
+#endif
- alloc_len = file_struct_len + dirname_len + basename_len
- + linkname_len + sum_len;
- bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
+ if (always_checksum && S_ISREG(mode))
+ extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
+ if (file_length > 0xFFFFFFFFu && S_ISREG(mode))
+ extra_len += EXTRA_LEN;
+
+ alloc_len = FILE_STRUCT_LEN + extra_len + basename_len + dirname_len
+ + linkname_len;
+ bp = pool_alloc(flist->file_pool, alloc_len, "recv_file_entry");
+
+ memset(bp, 0, FILE_STRUCT_LEN + extra_len);
+ bp += extra_len;
file = (struct file_struct *)bp;
- memset(bp, 0, file_struct_len);
- bp += file_struct_len;
+ bp += FILE_STRUCT_LEN;
+ memcpy(bp, basename, basename_len);
+ bp += basename_len + linkname_len; /* skip space for symlink too */
+
+#ifdef SUPPORT_HARD_LINKS
+ if (flags & XMIT_HLINKED)
+ file->flags |= FLAG_HLINKED;
+#endif
file->modtime = modtime;
- file->length = file_length;
+ file->len32 = (uint32)file_length;
+ if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) {
+ file->flags |= FLAG_LENGTH64;
+ OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
+ }
file->mode = mode;
- file->uid = uid;
- file->gid = gid;
+ if (preserve_uid)
+ F_UID(file) = uid;
+ if (preserve_gid)
+ F_GID(file) = gid;
if (dirname_len) {
file->dirname = lastdir = bp;
&& lastname[del_hier_name_len-1] == '.'
&& lastname[del_hier_name_len-2] == '/')
del_hier_name_len -= 2;
- file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
+ file->flags |= FLAG_TOP_DIR | FLAG_XFER_DIR;
} else if (in_del_hier) {
if (!relative_paths || !del_hier_name_len
|| (l1 >= del_hier_name_len
&& lastname[del_hier_name_len] == '/'))
- file->flags |= FLAG_DEL_HERE;
+ file->flags |= FLAG_XFER_DIR;
else
in_del_hier = 0;
}
}
- file->basename = bp;
- memcpy(bp, basename, basename_len);
- bp += basename_len;
-
if ((preserve_devices && IS_DEVICE(mode))
- || (preserve_specials && IS_SPECIAL(mode)))
- file->u.rdev = rdev;
+ || (preserve_specials && IS_SPECIAL(mode))) {
+ uint32 *devp = F_RDEV_P(file);
+ DEV_MAJOR(devp) = major(rdev);
+ DEV_MINOR(devp) = minor(rdev);
+ }
#ifdef SUPPORT_LINKS
if (linkname_len) {
- file->u.link = bp;
+ bp = (char*)F_BASENAME(file) + basename_len;
read_sbuf(f, bp, linkname_len - 1);
if (sanitize_paths)
sanitize_path(bp, bp, "", lastdir_depth, NULL);
- bp += linkname_len;
}
#endif
#ifdef SUPPORT_HARD_LINKS
- if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
- flags |= XMIT_HAS_IDEV_DATA;
- if (flags & XMIT_HAS_IDEV_DATA) {
- int64 inode;
+ if (preserve_hard_links && flags & XMIT_HLINKED) {
+ struct idev *idevp = pool_talloc(hlink_pool, struct idev,
+ 1, "inode_table");
+ F_HL_IDEV(file) = idevp;
if (protocol_version < 26) {
- dev = read_int(f);
- inode = read_int(f);
+ idevp->dev = read_int(f);
+ idevp->ino = read_int(f);
} else {
if (!(flags & XMIT_SAME_DEV))
dev = read_longint(f);
- inode = read_longint(f);
- }
- if (flist->hlink_pool) {
- file->link_u.idev = pool_talloc(flist->hlink_pool,
- struct idev, 1, "inode_table");
- file->F_INODE = inode;
- file->F_DEV = dev;
+ idevp->dev = dev;
+ idevp->ino = read_longint(f);
}
}
#endif
- if (always_checksum && (sum_len || protocol_version < 28)) {
- char *sum;
- if (sum_len) {
- file->u.sum = sum = bp;
- /*bp += sum_len;*/
- } else {
+ if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
+ if (S_ISREG(mode))
+ bp = (char*)F_SUM(file);
+ else {
/* Prior to 28, we get a useless set of nulls. */
- sum = empty_sum;
+ bp = tmp_sum;
}
- read_buf(f, sum, checksum_len);
+ read_buf(f, bp, checksum_len);
}
return file;
* statting directories if we're not recursing, but this is not a very
* important case. Some systems may not have d_type.
**/
-struct file_struct *make_file(char *fname, struct file_list *flist,
- STRUCT_STAT *stp, unsigned short flags,
- int filter_level)
+struct file_struct *make_file(const char *fname, struct file_list *flist,
+ STRUCT_STAT *stp, int flags, int filter_level)
{
static char *lastdir;
static int lastdir_len = -1;
struct file_struct *file;
STRUCT_STAT st;
- char sum[SUM_LENGTH];
char thisname[MAXPATHLEN];
char linkname[MAXPATHLEN];
- int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+ int alloc_len, basename_len, dirname_len, linkname_len;
+ int extra_len = (flist_extra_cnt - 1) * EXTRA_LEN;
char *basename, *dirname, *bp;
if (!flist || !flist->count) /* Ignore lastdir when invalid. */
if (sanitize_paths)
sanitize_path(thisname, thisname, "", 0, NULL);
- memset(sum, 0, SUM_LENGTH);
-
if (stp && S_ISDIR(stp->st_mode)) {
st = *stp; /* Needed for "symlink/." with --relative. */
*linkname = '\0'; /* make IBM code checker happy */
int save_errno = errno;
/* See if file is excluded before reporting an error. */
if (filter_level != NO_FILTERS
- && is_excluded(thisname, 0, filter_level))
+ && (is_excluded(thisname, 0, filter_level)
+ || is_excluded(thisname, 1, filter_level))) {
+ if (ignore_perishable && save_errno != ENOENT)
+ non_perishable_cnt++;
return NULL;
+ }
if (save_errno == ENOENT) {
#ifdef SUPPORT_LINKS
/* Avoid "vanished" error if symlink points nowhere. */
return NULL;
}
- /* We only care about directories because we need to avoid recursing
+ /* -x only affects directories because we need to avoid recursing
* 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
}
return NULL;
}
- flags |= FLAG_MOUNT_POINT;
+ flags |= FLAG_MOUNT_DIR;
}
- if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
+ if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
+ if (ignore_perishable)
+ non_perishable_cnt++;
return NULL;
+ }
if (lp_ignore_nonreadable(module_id)) {
#ifdef SUPPORT_LINKS
linkname_len = 0;
#endif
- sum_len = always_checksum && am_sender && S_ISREG(st.st_mode)
- ? MD4_SUM_LENGTH : 0;
+ if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode))
+ extra_len += EXTRA_LEN;
- alloc_len = file_struct_len + dirname_len + basename_len
- + linkname_len + sum_len;
+ alloc_len = FILE_STRUCT_LEN + extra_len + basename_len + dirname_len
+ + linkname_len;
if (flist)
bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
else {
out_of_memory("make_file");
}
+ memset(bp, 0, FILE_STRUCT_LEN + extra_len);
+ bp += extra_len;
file = (struct file_struct *)bp;
- memset(bp, 0, file_struct_len);
- bp += file_struct_len;
+ bp += FILE_STRUCT_LEN;
- file->flags = flags;
- file->modtime = st.st_mtime;
- file->length = st.st_size;
- file->mode = st.st_mode;
- file->uid = st.st_uid;
- file->gid = st.st_gid;
+ memcpy(bp, basename, basename_len);
+ bp += basename_len + linkname_len; /* skip space for symlink too */
#ifdef SUPPORT_HARD_LINKS
- if (flist && flist->hlink_pool) {
- if (protocol_version < 28) {
- if (S_ISREG(st.st_mode))
- file->link_u.idev = pool_talloc(
- flist->hlink_pool, struct idev, 1,
- "inode_table");
- } else {
- if (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
- file->link_u.idev = pool_talloc(
- flist->hlink_pool, struct idev, 1,
- "inode_table");
- }
+ if (preserve_hard_links && flist) {
+ if (protocol_version >= 28
+ ? (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
+ : S_ISREG(st.st_mode)) {
+ tmp_idev.dev = st.st_dev;
+ tmp_idev.ino = st.st_ino;
+ } else
+ tmp_idev.dev = tmp_idev.ino = 0;
}
- if (file->link_u.idev) {
- file->F_DEV = st.st_dev;
- file->F_INODE = st.st_ino;
+#endif
+
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
+ if (IS_DEVICE(st.st_mode) || IS_SPECIAL(st.st_mode)) {
+ tmp_rdev = st.st_rdev;
+ st.st_size = 0;
}
#endif
+ file->flags = flags;
+ file->modtime = st.st_mtime;
+ file->len32 = (uint32)st.st_size;
+ if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) {
+ file->flags |= FLAG_LENGTH64;
+ OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
+ }
+ file->mode = st.st_mode;
+ if (preserve_uid)
+ F_UID(file) = st.st_uid;
+ if (preserve_gid)
+ F_GID(file) = st.st_gid;
+
if (dirname_len) {
file->dirname = lastdir = bp;
lastdir_len = dirname_len - 1;
} else if (dirname)
file->dirname = dirname;
- file->basename = bp;
- memcpy(bp, basename, basename_len);
- bp += basename_len;
-
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
- if ((preserve_devices && IS_DEVICE(st.st_mode))
- || (preserve_specials && IS_SPECIAL(st.st_mode)))
- file->u.rdev = st.st_rdev;
-#endif
-
#ifdef SUPPORT_LINKS
if (linkname_len) {
- file->u.link = bp;
+ bp = (char*)F_BASENAME(file) + basename_len;
memcpy(bp, linkname, linkname_len);
- bp += linkname_len;
}
#endif
- if (sum_len) {
- file->u.sum = bp;
- file_checksum(thisname, bp, st.st_size);
- /*bp += sum_len;*/
- }
+ if (always_checksum && am_sender && S_ISREG(st.st_mode))
+ file_checksum(thisname, tmp_sum, st.st_size);
file->dir.root = flist_dir;
if (flist_find(the_file_list, file) >= 0
&& do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
file->modtime = st2.st_mtime;
- file->length = st2.st_size;
+ file->len32 = 0;
file->mode = st2.st_mode;
- file->uid = st2.st_uid;
- file->gid = st2.st_gid;
- file->u.link = NULL;
+ if (preserve_uid)
+ F_UID(file) = st2.st_uid;
+ if (preserve_gid)
+ F_GID(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;
+
return file;
}
+/* Only called for temporary file_struct entries created by make_file(). */
+void unmake_file(struct file_struct *file)
+{
+ int extra_cnt = flist_extra_cnt - 1 + LEN64_BUMP(file);
+ free(file->extras - extra_cnt);
+}
+
static struct file_struct *send_file_name(int f, struct file_list *flist,
char *fname, STRUCT_STAT *stp,
unsigned short flags)
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);
- }
+ flist->files[flist->count++] = file;
+ send_file_entry(file, f);
return file;
}
char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
if (S_ISDIR(file->mode)
- && !(file->flags & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
+ && !(file->flags & FLAG_MOUNT_DIR) && f_name(file, fbuf)) {
void *save_filters;
unsigned int len = strlen(fbuf);
if (len > 1 && fbuf[len-1] == '/')
* file list in memory without sending it over the wire. Also, get_dirlist()
* might call this with f set to -2, which also indicates that local filter
* rules should be ignored. */
-static void send_directory(int f, struct file_list *flist,
- char *fbuf, int len)
+static void send_directory(int f, struct file_list *flist, char *fbuf, int len)
{
struct dirent *di;
unsigned remainder;
start_write = stats.total_written;
gettimeofday(&start_tv, NULL);
- flist = flist_new(WITH_HLINK, "send_file_list");
+ flist = flist_new("send_file_list");
io_start_buffering_out();
if (filesfrom_fd >= 0) {
}
if (dir && *dir) {
- static char *lastdir;
+ static const char *lastdir;
static int lastdir_len;
strlcpy(olddir, curr_dir, sizeof olddir);
stats.flist_xfertime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+ (end_tv.tv_usec - start_tv.tv_usec) / 1000;
- if (flist->hlink_pool) {
- pool_destroy(flist->hlink_pool);
- flist->hlink_pool = NULL;
- }
-
/* Sort the list without removing any duplicates. This allows the
* receiving side to ask for any name they like, which gives us the
* flexibility to change the way we unduplicate names in the future
* without causing a compatibility problem with older versions. */
clean_flist(flist, 0, 0);
- send_uid_list(f);
+ if (!numeric_ids)
+ send_uid_list(f);
/* send the io_error flag */
write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
start_read = stats.total_read;
- flist = flist_new(WITH_HLINK, "recv_file_list");
+ flist = flist_new("recv_file_list");
- flist->count = 0;
- flist->malloced = 1000;
- flist->files = new_array(struct file_struct *, flist->malloced);
- if (!flist->files)
- goto oom;
while ((flags = read_byte(f)) != 0) {
struct file_struct *file;
if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
flags |= read_byte(f) << 8;
- file = receive_file_entry(flist, flags, f);
+ file = recv_file_entry(flist, flags, f);
if (S_ISREG(file->mode) || S_ISLNK(file->mode))
- stats.total_size += file->length;
+ stats.total_size += F_LENGTH(file);
flist->files[flist->count++] = file;
f_name(file, NULL));
}
}
- receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
+ recv_file_entry(NULL, 0, 0); /* Signal that we're done. */
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->count);
stats.num_files = flist->count;
return flist;
-
- oom:
- out_of_memory("recv_file_list");
- return NULL; /* not reached */
}
static int file_compare(struct file_struct **file1, struct file_struct **file2)
while (low <= high) {
mid = (low + high) / 2;
- if (flist->files[mid]->basename)
+ if (F_IS_ACTIVE(flist->files[mid]))
mid_up = mid;
else {
/* Scan for the next non-empty entry using the cached
* distance values. If the value isn't fully up-to-
* date, update it. */
mid_up = mid + flist->files[mid]->dir.depth;
- if (!flist->files[mid_up]->basename) {
+ if (!F_IS_ACTIVE(flist->files[mid_up])) {
do {
mid_up += flist->files[mid_up]->dir.depth;
- } while (!flist->files[mid_up]->basename);
+ } while (!F_IS_ACTIVE(flist->files[mid_up]));
flist->files[mid]->dir.depth = mid_up - mid;
}
if (mid_up > high) {
/* If there's nothing left above us, set high to
* a non-empty entry below us and continue. */
- high = mid - flist->files[mid]->length;
- if (!flist->files[high]->basename) {
+ high = mid - (int)flist->files[mid]->len32;
+ if (!F_IS_ACTIVE(flist->files[high])) {
do {
- high -= flist->files[high]->length;
- } while (!flist->files[high]->basename);
- flist->files[mid]->length = mid - high;
+ high -= (int)flist->files[high]->len32;
+ } while (!F_IS_ACTIVE(flist->files[high]));
+ flist->files[mid]->len32 = mid - high;
}
continue;
}
* Free up any resources a file_struct has allocated
* and clear the file.
*/
-void clear_file(struct file_struct *file, struct file_list *flist)
+void clear_file(struct file_struct *file)
{
- if (flist->hlink_pool && file->link_u.idev)
- pool_free(flist->hlink_pool, 0, file->link_u.idev);
- memset(file, 0, file_struct_len);
+ memset((char*)file + EXTRA_LEN, 0, FILE_STRUCT_LEN - EXTRA_LEN + 1);
/* In an empty entry, dir.depth is an offset to the next non-empty
- * entry. Likewise for length in the opposite direction. We assume
+ * entry. Likewise for len32 in the opposite direction. We assume
* that we're alone for now since flist_find() will adjust the counts
* it runs into that aren't up-to-date. */
- file->length = file->dir.depth = 1;
+ file->len32 = file->dir.depth = 1;
}
-/*
- * allocate a new file list
- */
-struct file_list *flist_new(int with_hlink, char *msg)
+/* Allocate a new file list. */
+struct file_list *flist_new(char *msg)
{
struct file_list *flist;
if (!flist)
out_of_memory(msg);
- memset(flist, 0, sizeof (struct file_list));
+ memset(flist, 0, sizeof flist[0]);
- if (!(flist->file_pool = pool_create(FILE_EXTENT, 0,
- out_of_memory, POOL_INTERN)))
+ if (!(flist->file_pool = pool_create(FILE_EXTENT, 0, out_of_memory, POOL_INTERN)))
out_of_memory(msg);
-#ifdef SUPPORT_HARD_LINKS
- if (with_hlink && preserve_hard_links) {
- if (!(flist->hlink_pool = pool_create(HLINK_EXTENT,
- sizeof (struct idev), out_of_memory, POOL_INTERN)))
- out_of_memory(msg);
- }
-#endif
-
return flist;
}
-/*
- * free up all elements in a flist
- */
+/* Free up all elements in a flist. */
void flist_free(struct file_list *flist)
{
pool_destroy(flist->file_pool);
- pool_destroy(flist->hlink_pool);
free(flist->files);
free(flist);
}
sizeof flist->files[0], (int (*)())file_compare);
for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
- if (flist->files[i]->basename) {
+ if (F_IS_ACTIVE(flist->files[i])) {
prev_i = i;
break;
}
int j;
struct file_struct *file = flist->files[i];
- if (!file->basename)
+ if (!F_IS_ACTIVE(file))
continue;
if (f_name_cmp(file, flist->files[prev_i]) == 0)
j = prev_i;
/* Make sure we don't lose track of a user-specified
* top directory. */
flist->files[keep]->flags |= flist->files[drop]->flags
- & (FLAG_TOP_DIR|FLAG_DEL_HERE);
+ & (FLAG_TOP_DIR|FLAG_XFER_DIR);
- clear_file(flist->files[drop], flist);
+ clear_file(flist->files[drop]);
if (keep == i) {
if (flist->low == drop) {
for (j = drop + 1;
- j < i && !flist->files[j]->basename;
+ j < i && !F_IS_ACTIVE(flist->files[j]);
j++) {}
flist->low = j;
}
if (fp->dir.depth >= 0)
break;
prev_i = -fp->dir.depth-1;
- clear_file(fp, flist);
+ clear_file(fp);
}
prev_depth = file->dir.depth;
if (is_excluded(f_name(file, fbuf), 1,
if (fp->dir.depth >= 0)
break;
prev_i = -fp->dir.depth-1;
- clear_file(fp, flist);
+ clear_file(fp);
}
for (i = flist->low; i <= flist->high; i++) {
- if (flist->files[i]->basename)
+ if (F_IS_ACTIVE(flist->files[i]))
break;
}
flist->low = i;
for (i = flist->high; i >= flist->low; i--) {
- if (flist->files[i]->basename)
+ if (F_IS_ACTIVE(flist->files[i]))
break;
}
flist->high = i;
{
char uidbuf[16], gidbuf[16], depthbuf[16];
struct file_struct *file;
+ const char *dir, *slash, *name, *trail;
const char *who = who_am_i();
int i;
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
- if ((am_root || am_sender) && preserve_uid)
- sprintf(uidbuf, " uid=%ld", (long)file->uid);
- else
+ if ((am_root || am_sender) && preserve_uid) {
+ snprintf(uidbuf, sizeof uidbuf, " uid=%ld",
+ (long)F_UID(file));
+ } else
*uidbuf = '\0';
- if (preserve_gid && file->gid != GID_NONE)
- sprintf(gidbuf, " gid=%ld", (long)file->gid);
- else
+ if (preserve_gid && F_GID(file) != GID_NONE) {
+ snprintf(gidbuf, sizeof gidbuf, " gid=%ld",
+ (long)F_GID(file));
+ } else
*gidbuf = '\0';
if (!am_sender)
- sprintf(depthbuf, "%d", file->dir.depth);
+ snprintf(depthbuf, sizeof depthbuf, "%d", file->dir.depth);
+ if (F_IS_ACTIVE(file)) {
+ if ((dir = file->dirname) == NULL)
+ dir = slash = "";
+ else
+ slash = "/";
+ name = F_BASENAME(file);
+ trail = S_ISDIR(file->mode) ? "/" : "";
+ } else
+ dir = slash = name = trail = "";
rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
who, i, am_sender ? NS(file->dir.root) : depthbuf,
- file->dirname ? file->dirname : "",
- file->dirname ? "/" : "", NS(file->basename),
- S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
- (double)file->length, uidbuf, gidbuf, file->flags);
+ dir, slash, name, trail, (int)file->mode,
+ (double)F_LENGTH(file), uidbuf, gidbuf, file->flags);
}
}
enum fnc_type type1, type2;
enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
- if (!f1 || !f1->basename) {
- if (!f2 || !f2->basename)
+ if (!f1 || !F_IS_ACTIVE(f1)) {
+ if (!f2 || !F_IS_ACTIVE(f2))
return 0;
return -1;
}
- if (!f2 || !f2->basename)
+ if (!f2 || !F_IS_ACTIVE(f2))
return 1;
c1 = (uchar*)f1->dirname;
c1 = c2 = NULL;
if (!c1) {
type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM;
- c1 = (uchar*)f1->basename;
+ c1 = (uchar*)F_BASENAME(f1);
if (type1 == t_PATH && *c1 == '.' && !c1[1]) {
type1 = t_ITEM;
state1 = s_TRAILING;
}
if (!c2) {
type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM;
- c2 = (uchar*)f2->basename;
+ c2 = (uchar*)F_BASENAME(f2);
if (type2 == t_PATH && *c2 == '.' && !c2[1]) {
type2 = t_ITEM;
state2 = s_TRAILING;
break;
case s_SLASH:
type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM;
- c1 = (uchar*)f1->basename;
+ c1 = (uchar*)F_BASENAME(f1);
if (type1 == t_PATH && *c1 == '.' && !c1[1]) {
type1 = t_ITEM;
state1 = s_TRAILING;
break;
case s_SLASH:
type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM;
- c2 = (uchar*)f2->basename;
+ c2 = (uchar*)F_BASENAME(f2);
if (type2 == t_PATH && *c2 == '.' && !c2[1]) {
type2 = t_ITEM;
state2 = s_TRAILING;
return dif;
}
+char *f_name_buf(void)
+{
+ static char names[5][MAXPATHLEN];
+ static unsigned int n;
+
+ n = (n + 1) % (sizeof names / sizeof names[0]);
+
+ return names[n];
+}
+
/* Return a copy of the full filename of a flist entry, using the indicated
* buffer or one of 5 static buffers if fbuf is NULL. No size-checking is
* done because we checked the size when creating the file_struct entry.
*/
char *f_name(struct file_struct *f, char *fbuf)
{
- if (!f || !f->basename)
+ if (!f || !F_IS_ACTIVE(f))
return NULL;
- if (!fbuf) {
- static char names[5][MAXPATHLEN];
- static unsigned int n;
-
- n = (n + 1) % (sizeof names / sizeof names[0]);
-
- fbuf = names[n];
- }
+ if (!fbuf)
+ fbuf = f_name_buf();
if (f->dirname) {
int len = strlen(f->dirname);
memcpy(fbuf, f->dirname, len);
fbuf[len] = '/';
- strcpy(fbuf + len + 1, f->basename);
+ strlcpy(fbuf + len + 1, F_BASENAME(f), MAXPATHLEN - (len + 1));
} else
- strcpy(fbuf, f->basename);
+ strlcpy(fbuf, F_BASENAME(f), MAXPATHLEN);
return fbuf;
}
* of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
* buffer (the functions we call will append names onto the end, but the old
* dir value will be restored on exit). */
-struct file_list *get_dirlist(char *dirname, int dlen,
- int ignore_filter_rules)
+struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
{
struct file_list *dirlist;
char dirbuf[MAXPATHLEN];
dirname = dirbuf;
}
- dirlist = flist_new(WITHOUT_HLINK, "get_dirlist");
+ dirlist = flist_new("get_dirlist");
recurse = 0;
xfer_dirs = 1;