else
stbuf->st_mode = S_IFREG | 0644;
- stbuf->st_ino = (ino_t)dentry->hard_link;
+ stbuf->st_ino = (ino_t)dentry->link_group_id;
stbuf->st_nlink = dentry_link_group_size(dentry);
stbuf->st_uid = getuid();
stbuf->st_gid = getgid();
/* Use the size of the unnamed (default) file stream. */
- lte = dentry_first_lte_resolved(dentry);
+ lte = dentry_unnamed_lte_resolved(dentry);
if (lte) {
if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
wimlib_assert(lte->staging_file_name);
num_transferred_fds = 0;
for (u16 i = 0; i < old_lte->num_allocated_fds; i++)
if (old_lte->fds[i] && old_lte->fds[i]->dentry &&
- old_lte->fds[i]->dentry->hard_link == link_group)
+ old_lte->fds[i]->dentry->link_group_id == link_group)
num_transferred_fds++;
DEBUG("Transferring %u file descriptors",
num_transferred_fds);
}
for (u16 i = 0, j = 0; ; i++) {
if (old_lte->fds[i] && old_lte->fds[i]->dentry &&
- old_lte->fds[i]->dentry->hard_link == link_group) {
+ old_lte->fds[i]->dentry->link_group_id == link_group) {
struct wimlib_fd *fd = old_lte->fds[i];
old_lte->fds[i] = NULL;
fd->lte = new_lte;
do {
struct dentry *d;
d = container_of(pos, struct dentry, link_group_list);
- wimlib_assert(d->hard_link == dentry->hard_link);
+ wimlib_assert(d->link_group_id == dentry->link_group_id);
lte_transfer_dentry(new_lte, d);
pos = pos->next;
} while (pos != &dentry->link_group_list);
* XXX*/
wimlib_assert(old_lte->refcnt > link_group_size);
- new_lte = lte_extract_fds(old_lte, dentry->hard_link);
+ new_lte = lte_extract_fds(old_lte, dentry->link_group_id);
if (!new_lte) {
ret = -ENOMEM;
goto out_delete_staging_file;
if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOTSUP;
- if (memcmp(name, "user.", 5) != 0)
+ if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
return -ENOATTR;
name += 5;
newdir = new_dentry(basename);
newdir->attributes |= FILE_ATTRIBUTE_DIRECTORY;
newdir->resolved = true;
- newdir->hard_link = next_link_group_id++;
+ newdir->link_group_id = next_link_group_id++;
link_dentry(newdir, parent);
return 0;
}
if (!dentry)
return -ENOMEM;
dentry->resolved = true;
- dentry->hard_link = next_link_group_id++;
+ dentry->link_group_id = next_link_group_id++;
dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
INIT_LIST_HEAD(&dentry->lte_group_list.list);
link_dentry(dentry, parent);
if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOTSUP;
- if (memcmp(name, "user.", 5) != 0)
+ if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
return -ENOATTR;
name += 5;
if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
return -ENOTSUP;
+ if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+ return -ENOATTR;
+ name += 5;
+
dentry = get_dentry(w, path);
if (!dentry)
return -ENOENT;
FREE(lte);
return -ENOMEM;
}
+ memcpy(value_copy, value, size);
lte->resource_location = RESOURCE_IN_ATTACHED_BUFFER;
lte->attached_buffer = value_copy;
lte->resource_entry.original_size = size;
dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
- dentry->hard_link = next_link_group_id++;
+ dentry->link_group_id = next_link_group_id++;
if (dentry_set_symlink(dentry, to, w->lookup_table, <e) != 0)
goto out_free_dentry;
lte_group_size++;
if (lte_group_size > lte->refcnt) {
#ifdef ENABLE_ERROR_MESSAGES
- ERROR("The following lookup table entry has a reference count "
+ struct dentry *example_dentry;
+ struct list_head *next;
+ struct stream_list_head *head;
+ WARNING("The following lookup table entry has a reference count "
"of %u, but", lte->refcnt);
- ERROR("We found %u references to it", lte_group_size);
+ WARNING("We found %u references to it", lte_group_size);
+ next = lte->lte_group_list.next;
+ head = container_of(next, struct stream_list_head, list);
+ if (head->type == STREAM_TYPE_NORMAL) {
+ example_dentry = container_of(head, struct dentry,
+ lte_group_list);
+ WARNING("(One dentry referencing it is at `%s')",
+ example_dentry->full_path_utf8);
+ }
print_lookup_table_entry(lte);
#endif
+ /* Guess what! install.wim for Windows 8 contains a stream with
+ * 2 dentries referencing it, but the lookup table entry has
+ * reference count of 1. So we will need to handle this case
+ * and not just make it be an error... I'm just setting the
+ * reference count to the number of references we found. */
+
+ #if 1
+ lte->refcnt = lte_group_size;
+ WARNING("Fixing reference count");
+ #else
return WIMLIB_ERR_INVALID_DENTRY;
+ #endif
}
return 0;
}
DEBUG("Selected image %d", image);
- next_link_group_id = assign_link_groups(wim->image_metadata[image - 1].lgt);
+ next_link_group_id = assign_link_group_ids(wim->image_metadata[image - 1].lgt);
/* Resolve all the lookup table entries of the dentry tree */
for_dentry_in_tree(wim_root_dentry(wim), dentry_resolve_ltes,