/* Figure out how big the file_struct is without trailing padding */
min_file_struct_len = ((char*)&f.flags - (char*)&f) + sizeof f.flags;
- min_file_struct_len = sizeof f; /* XXX test for build-farm */
}
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;
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;
#if SUPPORT_HARD_LINKS
if (preserve_hard_links) {
- idev_len = (protocol_version < 28 ? S_ISREG(st.st_mode)
- : !S_ISDIR(st.st_mode) && st.st_nlink > 1)
- ? sizeof (struct idev) : 0;
+ 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;
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) {