int io_error;
static char empty_sum[MD4_SUM_LENGTH];
+static unsigned int min_file_struct_len;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+void init_flist(void)
+{
+ struct file_struct f;
+
+ /* Figure out how big the file_struct is without trailing padding */
+ min_file_struct_len = ((char*)&f.flags - (char*)&f) + sizeof f.flags;
+}
+
+
static int show_filelist_p(void)
{
return verbose && (recurse || files_from) && !am_server;
if (verbose >= 2) {
rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
- who_am_i(),
- (double)sizeof(flist->files[0])
- * flist->malloced,
- (new_ptr == flist->files) ? " not" : "");
+ who_am_i(),
+ (double) sizeof flist->files[0] * flist->malloced,
+ (new_ptr == flist->files) ? " not" : "");
}
flist->files = (struct file_struct **) new_ptr;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+ int file_struct_len, idev_len;
OFF_T file_length;
char *basename, *dirname, *bp;
struct file_struct *file;
#endif
linkname_len = 0;
+#if SUPPORT_HARD_LINKS
+ if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
+ flags |= XMIT_HAS_IDEV_DATA;
+ if (flags & XMIT_HAS_IDEV_DATA)
+ idev_len = sizeof (struct idev);
+ else
+#endif
+ idev_len = 0;
+
sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
+ file_struct_len = idev_len? sizeof file[0] : min_file_struct_len;
- alloc_len = sizeof file[0] + dirname_len + basename_len
- + linkname_len + sum_len;
+ alloc_len = file_struct_len + dirname_len + basename_len
+ + linkname_len + sum_len + idev_len;
if (!(bp = new_array(char, alloc_len)))
out_of_memory("receive_file_entry");
file = *fptr = (struct file_struct *)bp;
- memset(bp, 0, sizeof file[0]);
- bp += sizeof file[0];
+ memset(bp, 0, min_file_struct_len);
+ bp += file_struct_len;
file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
file->modtime = modtime;
file->uid = uid;
file->gid = gid;
+#if SUPPORT_HARD_LINKS
+ if (idev_len) {
+ file->link_u.idev = (struct idev *)bp;
+ bp += idev_len;
+ }
+#endif
+
if (dirname_len) {
file->dirname = lastdir = bp;
lastdir_len = dirname_len - 1;
#endif
#if SUPPORT_HARD_LINKS
- if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
- flags |= XMIT_HAS_IDEV_DATA;
- if (flags & XMIT_HAS_IDEV_DATA) {
- if (!(file->link_u.idev = new(struct idev)))
- out_of_memory("file inode data");
+ if (idev_len) {
if (protocol_version < 26) {
dev = read_int(f);
file->F_INODE = read_int(f);
char thisname[MAXPATHLEN];
char linkname[MAXPATHLEN];
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+ int file_struct_len, idev_len;
char *basename, *dirname, *bp;
unsigned short flags = 0;
return NULL;
}
- if (one_file_system && st.st_dev != filesystem_dev) {
- /* We allow a directory though to preserve the mount point.
- * However, flag it so that we don't recurse. */
- if (!S_ISDIR(st.st_mode))
- return NULL;
+ /* We only care about 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
+ && S_ISDIR(st.st_mode))
flags |= FLAG_MOUNT_POINT;
- }
if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
return NULL;
linkname_len = 0;
#endif
+#if SUPPORT_HARD_LINKS
+ if (preserve_hard_links) {
+ if (protocol_version < 28) {
+ if (S_ISREG(st.st_mode))
+ idev_len = sizeof (struct idev);
+ else
+ idev_len = 0;
+ } else {
+ if (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
+ idev_len = sizeof (struct idev);
+ else
+ idev_len = 0;
+ }
+ } else
+#endif
+ idev_len = 0;
+
sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 0;
+ file_struct_len = idev_len? sizeof file[0] : min_file_struct_len;
- alloc_len = sizeof file[0] + dirname_len + basename_len
- + linkname_len + sum_len;
+ alloc_len = file_struct_len + dirname_len + basename_len
+ + linkname_len + sum_len + idev_len;
if (!(bp = new_array(char, alloc_len)))
out_of_memory("receive_file_entry");
file = (struct file_struct *)bp;
- memset(bp, 0, sizeof file[0]);
- bp += sizeof file[0];
+ memset(bp, 0, min_file_struct_len);
+ bp += file_struct_len;
file->flags = flags;
file->modtime = st.st_mtime;
file->uid = st.st_uid;
file->gid = st.st_gid;
+#if SUPPORT_HARD_LINKS
+ if (idev_len) {
+ file->link_u.idev = (struct idev *)bp;
+ bp += idev_len;
+ file->F_DEV = st.st_dev;
+ file->F_INODE = st.st_ino;
+ }
+#endif
+
if (dirname_len) {
file->dirname = lastdir = bp;
lastdir_len = dirname_len - 1;
}
#endif
-#if SUPPORT_HARD_LINKS
- if (preserve_hard_links) {
- if (protocol_version < 28 ? S_ISREG(st.st_mode)
- : !S_ISDIR(st.st_mode) && st.st_nlink > 1) {
- if (!(file->link_u.idev = new(struct idev)))
- out_of_memory("file inode data");
- file->F_DEV = st.st_dev;
- file->F_INODE = st.st_ino;
- }
- }
-#endif
-
if (sum_len) {
file->u.sum = bp;
file_checksum(thisname, bp, st.st_size);
*/
void free_file(struct file_struct *file, int free_the_struct)
{
-#if SUPPORT_HARD_LINKS
- if (file->link_u.idev)
- free((char*)file->link_u.idev); /* Handles link_u.links too. */
-#endif
if (free_the_struct)
free(file);
else
- memset(file, 0, sizeof file[0]);
+ memset(file, 0, min_file_struct_len);
}
return;
qsort(flist->files, flist->count,
- sizeof(flist->files[0]), (int (*)()) file_compare);
+ sizeof flist->files[0], (int (*)()) file_compare);
for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
if (flist->files[i]->basename) {
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff