tchar *display_description;
tchar *flags;
bool wimboot;
+
+ /* Note: must update clone_image_info() if adding new fields here */
+
struct wim_lookup_table *lookup_table; /* temporary field */
};
num_images = 0;
for_node_child(wim_node, child) {
if (node_is_element(child) && node_name_is(child, "IMAGE")) {
- if (num_images == INT_MAX) {
- return WIMLIB_ERR_IMAGE_COUNT;
+ if (unlikely(num_images == MAX_IMAGES)) {
+ ret = WIMLIB_ERR_IMAGE_COUNT;
+ goto err;
}
num_images++;
}
ERROR("WIM images are not indexed [1...%d] "
"in XML data as expected",
num_images);
- return WIMLIB_ERR_IMAGE_COUNT;
+ ret = WIMLIB_ERR_IMAGE_COUNT;
+ goto err;
}
}
{
int ret;
+ new->arch = old->arch;
+
ret = dup_strings_from_specs(old, new, windows_info_xml_string_specs,
ARRAY_LEN(windows_info_xml_string_specs));
if (ret)
if (ret)
return ret;
}
+ new->wimboot = old->wimboot;
return 0;
}
{
struct image_info *info = arg;
const struct wim_inode *inode = dentry->d_inode;
- struct wim_lookup_table_entry *lte;
/* Update directory count and file count.
*
* points) count as regular files. This is despite the fact that
* junction points have FILE_ATTRIBUTE_DIRECTORY set.
*/
- if (dentry_is_root(dentry))
- return 0;
- if (inode_is_directory(inode))
- info->dir_count++;
- else
- info->file_count++;
+ if (!dentry_is_root(dentry)) {
+ if (inode_is_directory(inode))
+ info->dir_count++;
+ else
+ info->file_count++;
+ }
/*
* Update total bytes and hard link bytes.
*
- * Unfortunately there are some inconsistencies/bugs in the way this is
- * done.
+ * We try to act the same as the MS implementation, even though there
+ * are some inconsistencies/bugs in the way it operates.
*
* If there are no alternate data streams in the image, the "total
* bytes" is the sum of the size of the un-named data stream of each
* link bytes", and this size is multiplied by the link count (NOT one
* less than the link count).
*/
- lte = inode_unnamed_lte(inode, info->lookup_table);
- if (lte) {
- info->total_bytes += lte->size;
- if (!dentry_is_first_in_inode(dentry))
- info->hard_link_bytes += lte->size;
- }
+ if (!(inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
+ FILE_ATTRIBUTE_REPARSE_POINT)))
+ {
+ struct wim_lookup_table_entry *lte;
+
+ lte = inode_unnamed_lte(inode, info->lookup_table);
+ if (lte) {
+ info->total_bytes += lte->size;
+ if (!dentry_is_first_in_inode(dentry))
+ info->hard_link_bytes += lte->size;
+ }
- if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) {
- for (unsigned i = 0; i < inode->i_num_ads; i++) {
- if (inode->i_ads_entries[i].stream_name_nbytes) {
- lte = inode_stream_lte(inode, i + 1, info->lookup_table);
- if (lte) {
- info->hard_link_bytes += inode->i_nlink *
- lte->size;
+ if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) {
+ for (unsigned i = 0; i < inode->i_num_ads; i++) {
+ if (inode->i_ads_entries[i].stream_name_nbytes) {
+ lte = inode_stream_lte(inode, i + 1, info->lookup_table);
+ if (lte) {
+ info->hard_link_bytes += inode->i_nlink *
+ lte->size;
+ }
}
}
}
size_t xml_len;
DEBUG("Writing WIM XML data (image=%d, offset=%"PRIu64")",
- image, total_bytes, wim->out_fd.offset);
+ image, wim->out_fd.offset);
ret = prepare_wim_xml_data(wim, image, total_bytes,
&xml_data, &xml_len);