#include <fuse.h>
#include <ftw.h>
#include <mqueue.h>
+#include <attr/xattr.h>
struct wimlib_fd {
u16 idx;
wimlib_assert(lte);
wimlib_assert(lte->num_opened_fds);
- if (lte->staging_file_name) {
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ wimlib_assert(lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
if (close(fd->staging_fd) != 0)
return -errno;
}
if (--lte->num_opened_fds == 0 && lte->refcnt == 0) {
- if (lte->staging_file_name)
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ wimlib_assert(lte->staging_file_name);
unlink(lte->staging_file_name);
+ }
free_lookup_table_entry(lte);
}
wimlib_assert(lte->fds[fd->idx] == fd);
put_dentry(dentry);
}
+static void remove_ads(struct dentry *dentry,
+ struct ads_entry *ads_entry,
+ struct lookup_table *lookup_table)
+{
+ struct lookup_table_entry *lte;
+
+ wimlib_assert(dentry->resolved);
+
+ lte = lte_decrement_refcnt(lte, lookup_table);
+ if (lte)
+ list_del(&ads_entry->lte_group_list.list);
+ dentry_remove_ads(dentry, ads_entry);
+}
+
/* Transfers file attributes from a struct dentry to a `stat' buffer. */
int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf)
{
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->staging_file_name) {
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
+ wimlib_assert(lte->staging_file_name);
struct stat native_stat;
if (stat(lte->staging_file_name, &native_stat) != 0) {
DEBUG("Failed to stat `%s': %m",
return -errno;
if (old_lte)
- ret = extract_resource_to_fd(w, &old_lte->resource_entry, fd,
- size);
+ ret = extract_wim_resource_to_fd(old_lte, fd, size);
else
ret = 0;
if (ret != 0 || close(fd) != 0) {
new_lte->resource_entry.original_size = size;
new_lte->refcnt = link_group_size;
random_hash(new_lte->hash);
+ if (new_lte->staging_file_name)
+ FREE(new_lte->staging_file_name);
new_lte->staging_file_name = staging_file_name;
+ new_lte->resource_location = RESOURCE_IN_STAGING_FILE;
lookup_table_insert(w->lookup_table, new_lte);
list_add(&new_lte->staging_list, &staging_list);
{
for (u16 i = 0, j = 0; j < lte->num_opened_fds; i++) {
if (lte->fds[i] && lte->fds[i]->staging_fd != -1) {
+ wimlib_assert(lte->resource_location == RESOURCE_IN_STAGING_FILE);
+ wimlib_assert(lte->staging_file_name);
if (close(lte->fds[i]->staging_fd) != 0) {
ERROR_WITH_ERRNO("Failed close file `%s'",
lte->staging_file_name);
u8 hash[SHA1_HASH_SIZE];
struct stat stbuf;
+ wimlib_assert(lte->resource_location == RESOURCE_IN_STAGING_FILE);
wimlib_assert(lte->staging_file_name);
ret = sha1sum(lte->staging_file_name, hash);
if (ret != 0)
return ret;
-
lookup_table_unlink(table, lte);
duplicate_lte = __lookup_resource(table, hash);
ERROR_WITH_ERRNO("Failed to stat `%s'", lte->staging_file_name);
return WIMLIB_ERR_STAT;
}
+ wimlib_assert(<e->file_on_disk == <e->staging_file_name);
+ lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
copy_hash(lte->hash, hash);
lte->resource_entry.original_size = stbuf.st_size;
+ lte->resource_entry.size = stbuf.st_size;
lookup_table_insert(table, lte);
}
*/
static int wimfs_getattr(const char *path, struct stat *stbuf)
{
- struct dentry *dentry = get_dentry(w, path);
- if (!dentry)
- return -ENOENT;
+ const char *stream_name;
+ char *p = NULL;
+ struct dentry *dentry;
+ int ret;
+
+ ret = lookup_resource(w, path,
+ get_lookup_flags() | LOOKUP_FLAG_DIRECTORY_OK,
+ &dentry, NULL, NULL);
+ if (ret != 0)
+ return ret;
return dentry_to_stbuf(dentry, stbuf);
}
+/* Read an alternate data stream through the XATTR interface, or get its size */
static int wimfs_getxattr(const char *path, const char *name, char *value,
size_t size)
{
- /* XXX */
- return -ENOTSUP;
+ int ret;
+ struct dentry *dentry;
+ struct ads_entry *ads_entry;
+ size_t res_size;
+ struct lookup_table_entry *lte;
+
+ 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;
+ ads_entry = dentry_get_ads_entry(dentry, name);
+ if (!ads_entry)
+ return -ENOATTR;
+
+ lte = ads_entry->lte;
+ res_size = wim_resource_size(lte);
+
+ if (size == 0)
+ return res_size;
+ if (res_size > size)
+ return -ERANGE;
+ ret = read_full_wim_resource(lte, value);
+ if (ret != 0)
+ return -EIO;
+ return res_size;
}
/* Create a hard link */
static int wimfs_listxattr(const char *path, char *list, size_t size)
{
- /* XXX */
- return -ENOTSUP;
+ struct dentry *dentry;
+ int ret;
+ char *p = list;
+ size_t needed_size;
+ unsigned i;
+ if (!(mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
+ return -ENOTSUP;
+
+ /* List alternate data streams, or get the list size */
+
+ ret = lookup_resource(w, path, get_lookup_flags(), &dentry, NULL, NULL);
+ if (ret != 0)
+ return ret;
+ if (size == 0) {
+ needed_size = 0;
+ for (i = 0; i < dentry->num_ads; i++)
+ needed_size += dentry->ads_entries[i].stream_name_utf8_len + 6;
+ return needed_size;
+ } else {
+ for (i = 0; i < dentry->num_ads; i++) {
+ needed_size = dentry->ads_entries[i].stream_name_utf8_len + 6;
+ if (needed_size > size)
+ return -ERANGE;
+ p += sprintf(p, "user.%s",
+ dentry->ads_entries[i].stream_name_utf8) + 1;
+ size -= needed_size;
+ }
+ return p - list;
+ }
}
/*
static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
{
const char *stream_name;
+ const char *file_name;
if ((mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
&& (stream_name = path_stream_name(path))) {
/* Make an alternate data stream */
struct ads_entry *new_entry;
struct dentry *dentry;
+ char *p = (char*)stream_name - 1;
+ wimlib_assert(*p == ':');
+ *p = '\0';
+
dentry = get_dentry(w, path);
if (!dentry || !dentry_is_regular_file(dentry))
return -ENOENT;
* directly from the WIM file if we are opening it read-only,
* but we need to extract the resource to the staging directory
* if we are opening it writable. */
- if (flags_writable(fi->flags) && !lte->staging_file_name) {
+ if (flags_writable(fi->flags) &&
+ lte->resource_location != RESOURCE_IN_STAGING_FILE) {
ret = extract_resource_to_staging_dir(dentry, stream_idx, <e,
lte->resource_entry.original_size);
if (ret != 0)
return ret;
}
- if (lte->staging_file_name) {
+ if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
fd->staging_fd = open(lte->staging_file_name, fi->flags);
if (fd->staging_fd == -1) {
close_wimlib_fd(fd);
wimlib_assert(fd->lte);
- if (fd->lte->staging_file_name) {
+ if (fd->lte->resource_location == RESOURCE_IN_STAGING_FILE) {
/* Read from staging file */
+ wimlib_assert(fd->lte->staging_file_name);
wimlib_assert(fd->staging_fd != -1);
ssize_t ret;
} else {
/* Read from WIM */
- struct resource_entry *res_entry;
- int ctype;
+ const struct resource_entry *res_entry;
res_entry = &fd->lte->resource_entry;
- ctype = wim_resource_compression_type(w, res_entry);
-
if (offset > res_entry->original_size)
return -EOVERFLOW;
size = min(size, res_entry->original_size - offset);
- if (read_resource(w->fp, res_entry->size,
- res_entry->original_size,
- res_entry->offset, ctype, size,
- offset, buf) != 0)
+ if (read_wim_resource(fd->lte, buf, size, offset, false) != 0)
return -EIO;
return size;
}
return 0;
}
+/* Remove an alternate data stream through the XATTR interface */
static int wimfs_removexattr(const char *path, const char *name)
{
- /* XXX */
- return -ENOTSUP;
+ struct dentry *dentry;
+ struct ads_entry *ads_entry;
+ int ret;
+ 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;
+
+ ads_entry = dentry_get_ads_entry(dentry, name);
+ if (!ads_entry)
+ return -ENOATTR;
+ remove_ads(dentry, ads_entry, w->lookup_table);
+ return 0;
}
/* Renames a file or directory. See rename (3) */
return 0;
}
+/* Write an alternate data stream through the XATTR interface */
static int wimfs_setxattr(const char *path, const char *name,
const char *value, size_t size, int flags)
{
- /* XXX */
- return -ENOTSUP;
+ struct dentry *dentry;
+ struct ads_entry *existing_ads_entry;
+ struct ads_entry *new_ads_entry;
+ struct lookup_table_entry *existing_lte;
+ struct lookup_table_entry *lte;
+ u8 value_hash[SHA1_HASH_SIZE];
+ int ret;
+ int fd;
+
+ 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;
+ existing_ads_entry = dentry_get_ads_entry(dentry, name);
+ if (existing_ads_entry) {
+ if (flags & XATTR_CREATE)
+ return -EEXIST;
+ remove_ads(dentry, existing_ads_entry, w->lookup_table);
+ } else {
+ if (flags & XATTR_REPLACE)
+ return -ENOATTR;
+ }
+ new_ads_entry = dentry_add_ads(dentry, name);
+ if (!new_ads_entry)
+ return -ENOMEM;
+
+ sha1_buffer(value, size, value_hash);
+
+ existing_lte = __lookup_resource(w->lookup_table, value_hash);
+
+ if (existing_lte) {
+ lte = existing_lte;
+ lte->refcnt++;
+ } else {
+ char *value_copy;
+ lte = new_lookup_table_entry();
+ if (!lte)
+ return -ENOMEM;
+ value_copy = MALLOC(size);
+ if (!value_copy) {
+ 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;
+ lte->resource_entry.size = size;
+ lte->resource_entry.flags = 0;
+ copy_hash(lte->hash, value_hash);
+ lookup_table_insert(w->lookup_table, lte);
+ }
+ new_ads_entry->lte = lte;
+ return 0;
}
static int wimfs_symlink(const char *to, const char *from)
remove_dentry(dentry, w->lookup_table);
} else {
/* We are removing an alternate data stream. */
- struct ads_entry *ads_entry;
-
- ads_entry = &dentry->ads_entries[stream_idx - 1];
- lte = lte_decrement_refcnt(lte, w->lookup_table);
- if (lte)
- list_del(&ads_entry->lte_group_list.list);
- dentry_remove_ads(dentry, ads_entry);
+ remove_ads(dentry, &dentry->ads_entries[stream_idx - 1],
+ w->lookup_table);
}
/* Beware: The lookup table entry(s) may still be referenced by users
* that have opened the corresponding streams. They are freed later in
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,
if (!p)
return WIMLIB_ERR_NOMEM;
- argv[argc++] = "mount";
+ argv[argc++] = "imagex";
argv[argc++] = p;
argv[argc++] = "-s"; /* disable multi-threaded operation */
git://wimlib.net / wimlib / blobdiff