/*
* dentry.c
*
- * A dentry (directory entry) contains the metadata for a file. In the WIM file
- * format, the dentries are stored in the "metadata resource" section right
- * after the security data. Each image in the WIM file has its own metadata
- * resource with its own security data and dentry tree. Dentries in different
- * images may share file resources by referring to the same lookup table
- * entries.
+ * In the WIM file format, the dentries are stored in the "metadata resource"
+ * section right after the security data. Each image in the WIM file has its
+ * own metadata resource with its own security data and dentry tree. Dentries
+ * in different images may share file resources by referring to the same lookup
+ * table entries.
*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
* wimlib; if not, see http://www.gnu.org/licenses/.
*/
-#include <errno.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-
+#include "buffer_io.h"
#include "dentry.h"
-#include "io.h"
#include "lookup_table.h"
-#include "sha1.h"
#include "timestamp.h"
#include "wimlib_internal.h"
-
+#include <errno.h>
/* Calculates the unaligned length, in bytes, of an on-disk WIM dentry that has
* a file name and short name that take the specified numbers of bytes. This
* excludes any alternate data stream entries that may follow the dentry. */
-static u64 __dentry_correct_length_unaligned(u16 file_name_len,
- u16 short_name_len)
+static u64
+__dentry_correct_length_unaligned(u16 file_name_nbytes, u16 short_name_nbytes)
{
u64 length = WIM_DENTRY_DISK_SIZE;
- if (file_name_len)
- length += file_name_len + 2;
- if (short_name_len)
- length += short_name_len + 2;
+ if (file_name_nbytes)
+ length += file_name_nbytes + 2;
+ if (short_name_nbytes)
+ length += short_name_nbytes + 2;
return length;
}
* the file name length and short name length. Note that dentry->length is
* ignored; also, this excludes any alternate data stream entries that may
* follow the dentry. */
-static u64 dentry_correct_length_unaligned(const struct dentry *dentry)
+static u64
+dentry_correct_length_unaligned(const struct wim_dentry *dentry)
{
- return __dentry_correct_length_unaligned(dentry->file_name_len,
- dentry->short_name_len);
+ return __dentry_correct_length_unaligned(dentry->file_name_nbytes,
+ dentry->short_name_nbytes);
}
/* Return the "correct" value to write in the length field of a WIM dentry,
* based on the file name length and short name length. */
-static u64 dentry_correct_length(const struct dentry *dentry)
+static u64
+dentry_correct_length(const struct wim_dentry *dentry)
{
return (dentry_correct_length_unaligned(dentry) + 7) & ~7;
}
-/* Return %true iff @dentry has the UTF-8 file name @name that has length
- * @name_len bytes. */
-static bool dentry_has_name(const struct dentry *dentry, const char *name,
- size_t name_len)
-{
- if (dentry->file_name_utf8_len != name_len)
- return false;
- return memcmp(dentry->file_name_utf8, name, name_len) == 0;
-}
-
-/* Return %true iff the alternate data stream entry @entry has the UTF-8 stream
- * name @name that has length @name_len bytes. */
-static inline bool ads_entry_has_name(const struct ads_entry *entry,
- const char *name, size_t name_len)
+/* Return %true iff the alternate data stream entry @entry has the UTF-16LE
+ * stream name @name that has length @name_nbytes bytes. */
+static inline bool
+ads_entry_has_name(const struct wim_ads_entry *entry,
+ const utf16lechar *name, size_t name_nbytes)
{
- if (entry->stream_name_utf8_len != name_len)
- return false;
- return memcmp(entry->stream_name_utf8, name, name_len) == 0;
+ return entry->stream_name_nbytes == name_nbytes &&
+ memcmp(entry->stream_name, name, name_nbytes) == 0;
}
-/* Duplicates a UTF-8 name into UTF-8 and UTF-16 strings and returns the strings
- * and their lengths in the pointer arguments */
-int get_names(char **name_utf16_ret, char **name_utf8_ret,
- u16 *name_utf16_len_ret, u16 *name_utf8_len_ret,
- const char *name)
+/* Duplicates a string of system-dependent encoding into a UTF-16LE string and
+ * returns the string and its length, in bytes, in the pointer arguments. Frees
+ * any existing string at the return location before overwriting it. */
+static int
+get_utf16le_name(const tchar *name, utf16lechar **name_utf16le_ret,
+ u16 *name_utf16le_nbytes_ret)
{
- size_t utf8_len;
- size_t utf16_len;
- char *name_utf16, *name_utf8;
-
- utf8_len = strlen(name);
-
- name_utf16 = utf8_to_utf16(name, utf8_len, &utf16_len);
-
- if (!name_utf16)
+ utf16lechar *name_utf16le;
+ size_t name_utf16le_nbytes;
+ int ret;
+#if TCHAR_IS_UTF16LE
+ name_utf16le_nbytes = tstrlen(name) * sizeof(utf16lechar);
+ name_utf16le = MALLOC(name_utf16le_nbytes + sizeof(utf16lechar));
+ if (!name_utf16le)
return WIMLIB_ERR_NOMEM;
+ memcpy(name_utf16le, name, name_utf16le_nbytes + sizeof(utf16lechar));
+ ret = 0;
+#else
- name_utf8 = MALLOC(utf8_len + 1);
- if (!name_utf8) {
- FREE(name_utf8);
- return WIMLIB_ERR_NOMEM;
+ ret = tstr_to_utf16le(name, tstrlen(name), &name_utf16le,
+ &name_utf16le_nbytes);
+ if (ret == 0) {
+ if (name_utf16le_nbytes > 0xffff) {
+ FREE(name_utf16le);
+ ERROR("Multibyte string \"%"TS"\" is too long!", name);
+ ret = WIMLIB_ERR_INVALID_UTF8_STRING;
+ }
}
- memcpy(name_utf8, name, utf8_len + 1);
- FREE(*name_utf8_ret);
- FREE(*name_utf16_ret);
- *name_utf8_ret = name_utf8;
- *name_utf16_ret = name_utf16;
- *name_utf8_len_ret = utf8_len;
- *name_utf16_len_ret = utf16_len;
- return 0;
+#endif
+ if (ret == 0) {
+ FREE(*name_utf16le_ret);
+ *name_utf16le_ret = name_utf16le;
+ *name_utf16le_nbytes_ret = name_utf16le_nbytes;
+ }
+ return ret;
}
-/* Changes the name of a dentry to @new_name. Only changes the file_name and
- * file_name_utf8 fields; does not change the short_name, short_name_utf8, or
- * full_path_utf8 fields. Also recalculates its length. */
-static int change_dentry_name(struct dentry *dentry, const char *new_name)
+/* Sets the name of a WIM dentry from a multibyte string. */
+int
+set_dentry_name(struct wim_dentry *dentry, const tchar *new_name)
{
int ret;
-
- ret = get_names(&dentry->file_name, &dentry->file_name_utf8,
- &dentry->file_name_len, &dentry->file_name_utf8_len,
- new_name);
- FREE(dentry->short_name);
- dentry->short_name_len = 0;
- if (ret == 0)
+ ret = get_utf16le_name(new_name, &dentry->file_name,
+ &dentry->file_name_nbytes);
+ if (ret == 0) {
+ /* Clear the short name and recalculate the dentry length */
+ if (dentry_has_short_name(dentry)) {
+ FREE(dentry->short_name);
+ dentry->short_name = NULL;
+ dentry->short_name_nbytes = 0;
+ }
dentry->length = dentry_correct_length(dentry);
+ }
return ret;
}
-/*
- * Changes the name of an alternate data stream */
-static int change_ads_name(struct ads_entry *entry, const char *new_name)
-{
- return get_names(&entry->stream_name, &entry->stream_name_utf8,
- &entry->stream_name_len,
- &entry->stream_name_utf8_len,
- new_name);
-}
-
/* Returns the total length of a WIM alternate data stream entry on-disk,
* including the stream name, the null terminator, AND the padding after the
- * entry to align the next one (or the next dentry) on an 8-byte boundary. */
-static u64 ads_entry_total_length(const struct ads_entry *entry)
+ * entry to align the next ADS entry or dentry on an 8-byte boundary. */
+static u64
+ads_entry_total_length(const struct wim_ads_entry *entry)
{
u64 len = WIM_ADS_ENTRY_DISK_SIZE;
- if (entry->stream_name_len)
- len += entry->stream_name_len + 2;
+ if (entry->stream_name_nbytes)
+ len += entry->stream_name_nbytes + 2;
return (len + 7) & ~7;
}
-static u64 __dentry_total_length(const struct dentry *dentry, u64 length)
+static u64
+__dentry_total_length(const struct wim_dentry *dentry, u64 length)
{
- const struct inode *inode = dentry->d_inode;
- for (u16 i = 0; i < inode->num_ads; i++)
- length += ads_entry_total_length(&inode->ads_entries[i]);
+ const struct wim_inode *inode = dentry->d_inode;
+ for (u16 i = 0; i < inode->i_num_ads; i++)
+ length += ads_entry_total_length(&inode->i_ads_entries[i]);
return (length + 7) & ~7;
}
/* Calculate the aligned *total* length of an on-disk WIM dentry. This includes
* all alternate data streams. */
-u64 dentry_correct_total_length(const struct dentry *dentry)
+u64
+dentry_correct_total_length(const struct wim_dentry *dentry)
{
return __dentry_total_length(dentry,
dentry_correct_length_unaligned(dentry));
/* Like dentry_correct_total_length(), but use the existing dentry->length field
* instead of calculating its "correct" value. */
-static u64 dentry_total_length(const struct dentry *dentry)
+static u64
+dentry_total_length(const struct wim_dentry *dentry)
{
return __dentry_total_length(dentry, dentry->length);
}
-/* Transfers file attributes from a `stat' buffer to a WIM "inode". */
-void stbuf_to_inode(const struct stat *stbuf, struct inode *inode)
-{
- if (S_ISLNK(stbuf->st_mode)) {
- inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
- inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
- } else if (S_ISDIR(stbuf->st_mode)) {
- inode->attributes = FILE_ATTRIBUTE_DIRECTORY;
- } else {
- inode->attributes = FILE_ATTRIBUTE_NORMAL;
- }
- if (sizeof(ino_t) >= 8)
- inode->ino = (u64)stbuf->st_ino;
- else
- inode->ino = (u64)stbuf->st_ino |
- ((u64)stbuf->st_dev << ((sizeof(ino_t) * 8) & 63));
- /* Set timestamps */
- inode->creation_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
- inode->last_write_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
- inode->last_access_time = timespec_to_wim_timestamp(&stbuf->st_atim);
-}
-
-#ifdef WITH_FUSE
-/* Transfers file attributes from a struct inode to a `stat' buffer.
- *
- * The lookup table entry tells us which stream in the inode we are statting.
- * For a named data stream, everything returned is the same as the unnamed data
- * stream except possibly the size and block count. */
-int inode_to_stbuf(const struct inode *inode, struct lookup_table_entry *lte,
- struct stat *stbuf)
-{
- if (inode_is_symlink(inode))
- stbuf->st_mode = S_IFLNK | 0777;
- else if (inode_is_directory(inode))
- stbuf->st_mode = S_IFDIR | 0755;
- else
- stbuf->st_mode = S_IFREG | 0755;
-
- stbuf->st_ino = (ino_t)inode->ino;
- stbuf->st_nlink = inode->link_count;
- stbuf->st_uid = getuid();
- stbuf->st_gid = getgid();
-
- if (lte) {
- 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",
- lte->staging_file_name);
- return -errno;
- }
- stbuf->st_size = native_stat.st_size;
- } else {
- stbuf->st_size = wim_resource_size(lte);
- }
- } else {
- stbuf->st_size = 0;
- }
-
- stbuf->st_atime = wim_timestamp_to_unix(inode->last_access_time);
- stbuf->st_mtime = wim_timestamp_to_unix(inode->last_write_time);
- stbuf->st_ctime = wim_timestamp_to_unix(inode->creation_time);
- stbuf->st_blocks = (stbuf->st_size + 511) / 512;
- return 0;
-}
-#endif
-
-int for_dentry_in_rbtree(struct rb_node *root,
- int (*visitor)(struct dentry *, void *),
- void *arg)
+int
+for_dentry_in_rbtree(struct rb_node *root,
+ int (*visitor)(struct wim_dentry *, void *),
+ void *arg)
{
int ret;
struct rb_node *node = root;
LIST_HEAD(stack);
- while (true) {
+ while (1) {
if (node) {
list_add(&rbnode_dentry(node)->tmp_list, &stack);
node = node->rb_left;
} else {
struct list_head *next;
- struct dentry *dentry;
+ struct wim_dentry *dentry;
next = stack.next;
if (next == &stack)
return 0;
- dentry = container_of(next, struct dentry, tmp_list);
+ dentry = container_of(next, struct wim_dentry, tmp_list);
list_del(next);
ret = visitor(dentry, arg);
if (ret != 0)
}
}
-static int for_dentry_tree_in_rbtree_depth(struct rb_node *node,
- int (*visitor)(struct dentry*, void*),
- void *arg)
+static int
+for_dentry_tree_in_rbtree_depth(struct rb_node *node,
+ int (*visitor)(struct wim_dentry*, void*),
+ void *arg)
{
int ret;
if (node) {
return 0;
}
-/*#define RECURSIVE_FOR_DENTRY_IN_TREE*/
-
-#ifdef RECURSIVE_FOR_DENTRY_IN_TREE
-static int for_dentry_tree_in_rbtree(struct rb_node *node,
- int (*visitor)(struct dentry*, void*),
- void *arg)
+static int
+for_dentry_tree_in_rbtree(struct rb_node *node,
+ int (*visitor)(struct wim_dentry*, void*),
+ void *arg)
{
int ret;
if (node) {
ret = for_dentry_tree_in_rbtree(node->rb_left, visitor, arg);
- if (ret != 0)
+ if (ret)
return ret;
ret = for_dentry_in_tree(rbnode_dentry(node), visitor, arg);
- if (ret != 0)
+ if (ret)
return ret;
ret = for_dentry_tree_in_rbtree(node->rb_right, visitor, arg);
- if (ret != 0)
+ if (ret)
return ret;
}
return 0;
}
-#endif
-/*
- * Calls a function on all directory entries in a WIM dentry tree. Logically,
+/* Calls a function on all directory entries in a WIM dentry tree. Logically,
* this is a pre-order traversal (the function is called on a parent dentry
* before its children), but sibling dentries will be visited in order as well.
- *
- * In reality, the data structures are more complicated than the above might
- * suggest because there is a separate red-black tree for each dentry that
- * contains its direct children.
- */
-int for_dentry_in_tree(struct dentry *root,
- int (*visitor)(struct dentry*, void*), void *arg)
+ * */
+int
+for_dentry_in_tree(struct wim_dentry *root,
+ int (*visitor)(struct wim_dentry*, void*), void *arg)
{
-#ifdef RECURSIVE_FOR_DENTRY_IN_TREE
- int ret = visitor(root, arg);
- if (ret != 0)
- return ret;
- return for_dentry_tree_in_rbtree(root->d_inode->children.rb_node, visitor, arg);
-#else
int ret;
- struct list_head main_stack;
- struct list_head sibling_stack;
- struct list_head *sibling_stack_bottom;
- struct dentry *main_dentry;
- struct rb_node *node;
- struct list_head *next_sibling;
- struct dentry *dentry;
- ret = visitor(root, arg);
- if (ret != 0)
+ if (!root)
+ return 0;
+ ret = (*visitor)(root, arg);
+ if (ret)
return ret;
-
- main_dentry = root;
- sibling_stack_bottom = &sibling_stack;
- INIT_LIST_HEAD(&main_stack);
- INIT_LIST_HEAD(&sibling_stack);
-
- list_add(&root->tmp_list, &main_stack);
- node = root->d_inode->children.rb_node;
-
- while (1) {
- // Prepare for non-recursive in-order traversal of the red-black
- // tree of this dentry's children
-
- while (node) {
- // Push this node to the sibling stack and examine the
- // left neighbor, if any
- list_add(&rbnode_dentry(node)->tmp_list, &sibling_stack);
- node = node->rb_left;
- }
-
- next_sibling = sibling_stack.next;
- if (next_sibling == sibling_stack_bottom) {
- // Done with all siblings. Pop the main dentry to move
- // back up one level.
- main_dentry = container_of(main_stack.next,
- struct dentry,
- tmp_list);
- list_del(&main_dentry->tmp_list);
-
- if (main_dentry == root)
- goto out;
-
- // Restore sibling stack bottom from the previous level
- sibling_stack_bottom = (void*)main_dentry->parent;
-
- // Restore the just-popped main dentry's parent
- main_dentry->parent = container_of(main_stack.next,
- struct dentry,
- tmp_list);
-
- // The next sibling to traverse in the previous level,
- // in the in-order traversal of the red-black tree, is
- // the one to the right.
- node = main_dentry->rb_node.rb_right;
- } else {
- // The sibling stack is not empty, so there are more to
- // go!
-
- // Pop a sibling from the stack.
- list_del(next_sibling);
- dentry = container_of(next_sibling, struct dentry, tmp_list);
-
- // Visit the sibling.
- ret = visitor(dentry, arg);
- if (ret != 0) {
- // Failed. Restore parent pointers for the
- // dentries in the main stack
- list_for_each_entry(dentry, &main_stack, tmp_list) {
- dentry->parent = container_of(dentry->tmp_list.next,
- struct dentry,
- tmp_list);
- }
- goto out;
- }
-
- // We'd like to recursively visit the dentry tree rooted
- // at this sibling. To do this, add it to the main
- // stack, save the bottom of this level's sibling stack
- // in the dentry->parent field, re-set the bottom of the
- // sibling stack to be its current height, and set
- // main_dentry to the sibling so it becomes the parent
- // dentry in the next iteration through the outer loop.
- if (inode_has_children(dentry->d_inode)) {
- list_add(&dentry->tmp_list, &main_stack);
- dentry->parent = (void*)sibling_stack_bottom;
- sibling_stack_bottom = sibling_stack.next;
-
- main_dentry = dentry;
- node = main_dentry->d_inode->children.rb_node;
- } else {
- node = dentry->rb_node.rb_right;
- }
- }
- }
-out:
- root->parent = root;
- return ret;
-#endif
+ return for_dentry_tree_in_rbtree(root->d_inode->i_children.rb_node,
+ visitor,
+ arg);
}
-/*
- * Like for_dentry_in_tree(), but the visitor function is always called on a
- * dentry's children before on itself.
- */
-int for_dentry_in_tree_depth(struct dentry *root,
- int (*visitor)(struct dentry*, void*), void *arg)
+/* Like for_dentry_in_tree(), but the visitor function is always called on a
+ * dentry's children before on itself. */
+int
+for_dentry_in_tree_depth(struct wim_dentry *root,
+ int (*visitor)(struct wim_dentry*, void*), void *arg)
{
-#if 1
int ret;
- ret = for_dentry_tree_in_rbtree_depth(root->d_inode->children.rb_node,
+
+ if (!root)
+ return 0;
+ ret = for_dentry_tree_in_rbtree_depth(root->d_inode->i_children.rb_node,
visitor, arg);
- if (ret != 0)
+ if (ret)
return ret;
- return visitor(root, arg);
+ return (*visitor)(root, arg);
+}
-#else
+/* Calculate the full path of @dentry. The full path of its parent must have
+ * already been calculated, or it must be the root dentry. */
+static int
+calculate_dentry_full_path(struct wim_dentry *dentry)
+{
+ tchar *full_path;
+ u32 full_path_nbytes;
int ret;
- struct list_head main_stack;
- struct list_head sibling_stack;
- struct list_head *sibling_stack_bottom;
- struct dentry *main_dentry;
- struct rb_node *node;
- struct list_head *next_sibling;
- struct dentry *dentry;
- main_dentry = root;
- sibling_stack_bottom = &sibling_stack;
- INIT_LIST_HEAD(&main_stack);
- INIT_LIST_HEAD(&sibling_stack);
-
- list_add(&main_dentry->tmp_list, &main_stack);
+ if (dentry->_full_path)
+ return 0;
- while (1) {
- node = main_dentry->d_inode->children.rb_node;
+ if (dentry_is_root(dentry)) {
+ full_path = TSTRDUP(T("/"));
+ if (!full_path)
+ return WIMLIB_ERR_NOMEM;
+ full_path_nbytes = 1 * sizeof(tchar);
+ } else {
+ struct wim_dentry *parent;
+ tchar *parent_full_path;
+ u32 parent_full_path_nbytes;
+ size_t filename_nbytes;
- while (1) {
- if (node->rb_left) {
- list_add(&rbnode_dentry(node)->tmp_list, &sibling_stack);
- node = node->rb_left;
- continue;
- }
- if (node->rb_right) {
- list_add(&rbnode_dentry(node)->tmp_list, &sibling_stack);
- node = node->rb_right;
- continue;
+ parent = dentry->parent;
+ if (dentry_is_root(parent)) {
+ parent_full_path = T("");
+ parent_full_path_nbytes = 0;
+ } else {
+ if (!parent->_full_path) {
+ ret = calculate_dentry_full_path(parent);
+ if (ret)
+ return ret;
}
- list_add(&rbnode_dentry(node)->tmp_list, &sibling_stack);
+ parent_full_path = parent->_full_path;
+ parent_full_path_nbytes = parent->full_path_nbytes;
}
- pop_sibling:
- next_sibling = sibling_stack.next;
- if (next_sibling == sibling_stack_bottom) {
- main_dentry = container_of(main_stack.next,
- struct dentry,
- tmp_list);
- list_del(&main_dentry->tmp_list);
-
-
- sibling_stack_bottom = (void*)main_dentry->parent;
-
- if (main_dentry == root) {
- main_dentry->parent = main_dentry;
- ret = visitor(dentry, arg);
- return ret;
- } else {
- main_dentry->parent = container_of(main_stack.next,
- struct dentry,
- tmp_list);
- }
-
- ret = visitor(main_dentry, arg);
-
- if (ret != 0) {
- list_del(&root->tmp_list);
- list_for_each_entry(dentry, &main_stack, tmp_list) {
- dentry->parent = container_of(dentry->tmp_list.next,
- struct dentry,
- tmp_list);
- }
- root->parent = root;
+ /* Append this dentry's name as a tchar string to the full path
+ * of the parent followed by the path separator */
+ #if TCHAR_IS_UTF16LE
+ filename_nbytes = dentry->file_name_nbytes;
+ #else
+ {
+ int ret = utf16le_to_tstr_nbytes(dentry->file_name,
+ dentry->file_name_nbytes,
+ &filename_nbytes);
+ if (ret)
return ret;
- }
- goto pop_sibling;
- } else {
-
- list_del(next_sibling);
- dentry = container_of(next_sibling, struct dentry, tmp_list);
-
-
- list_add(&dentry->tmp_list, &main_stack);
- dentry->parent = (void*)sibling_stack_bottom;
- sibling_stack_bottom = sibling_stack.next;
-
- main_dentry = dentry;
}
+ #endif
+
+ full_path_nbytes = parent_full_path_nbytes + sizeof(tchar) +
+ filename_nbytes;
+ full_path = MALLOC(full_path_nbytes + sizeof(tchar));
+ if (!full_path)
+ return WIMLIB_ERR_NOMEM;
+ memcpy(full_path, parent_full_path, parent_full_path_nbytes);
+ full_path[parent_full_path_nbytes / sizeof(tchar)] = T('/');
+ #if TCHAR_IS_UTF16LE
+ memcpy(&full_path[parent_full_path_nbytes / sizeof(tchar) + 1],
+ dentry->file_name,
+ filename_nbytes + sizeof(tchar));
+ #else
+ utf16le_to_tstr_buf(dentry->file_name,
+ dentry->file_name_nbytes,
+ &full_path[parent_full_path_nbytes /
+ sizeof(tchar) + 1]);
+ #endif
}
-#endif
+ dentry->_full_path = full_path;
+ dentry->full_path_nbytes= full_path_nbytes;
+ return 0;
}
-/*
- * Calculate the full path of @dentry, based on its parent's full path and on
- * its UTF-8 file name.
- */
-int calculate_dentry_full_path(struct dentry *dentry, void *ignore)
+static int
+do_calculate_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
{
- char *full_path;
- u32 full_path_len;
- if (dentry_is_root(dentry)) {
- full_path = MALLOC(2);
- if (!full_path)
- goto oom;
- full_path[0] = '/';
- full_path[1] = '\0';
- full_path_len = 1;
- } else {
- char *parent_full_path;
- u32 parent_full_path_len;
- const struct dentry *parent = dentry->parent;
+ return calculate_dentry_full_path(dentry);
+}
- if (dentry_is_root(parent)) {
- parent_full_path = "";
- parent_full_path_len = 0;
- } else {
- parent_full_path = parent->full_path_utf8;
- parent_full_path_len = parent->full_path_utf8_len;
- }
+int
+calculate_dentry_tree_full_paths(struct wim_dentry *root)
+{
+ return for_dentry_in_tree(root, do_calculate_dentry_full_path, NULL);
+}
- full_path_len = parent_full_path_len + 1 +
- dentry->file_name_utf8_len;
- full_path = MALLOC(full_path_len + 1);
- if (!full_path)
- goto oom;
-
- memcpy(full_path, parent_full_path, parent_full_path_len);
- full_path[parent_full_path_len] = '/';
- memcpy(full_path + parent_full_path_len + 1,
- dentry->file_name_utf8,
- dentry->file_name_utf8_len);
- full_path[full_path_len] = '\0';
- }
- FREE(dentry->full_path_utf8);
- dentry->full_path_utf8 = full_path;
- dentry->full_path_utf8_len = full_path_len;
- return 0;
-oom:
- ERROR("Out of memory while calculating dentry full path");
- return WIMLIB_ERR_NOMEM;
+tchar *
+dentry_full_path(struct wim_dentry *dentry)
+{
+ calculate_dentry_full_path(dentry);
+ return dentry->_full_path;
}
-static int increment_subdir_offset(struct dentry *dentry, void *subdir_offset_p)
+static int
+increment_subdir_offset(struct wim_dentry *dentry, void *subdir_offset_p)
{
*(u64*)subdir_offset_p += dentry_correct_total_length(dentry);
return 0;
}
-static int call_calculate_subdir_offsets(struct dentry *dentry,
- void *subdir_offset_p)
+static int
+call_calculate_subdir_offsets(struct wim_dentry *dentry, void *subdir_offset_p)
{
calculate_subdir_offsets(dentry, subdir_offset_p);
return 0;
* @subdir_offset_p: The current subdirectory offset; i.e., the subdirectory
* offset for @dentry.
*/
-void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p)
+void
+calculate_subdir_offsets(struct wim_dentry *dentry, u64 *subdir_offset_p)
{
struct rb_node *node;
dentry->subdir_offset = *subdir_offset_p;
- node = dentry->d_inode->children.rb_node;
+ node = dentry->d_inode->i_children.rb_node;
if (node) {
/* Advance the subdir offset by the amount of space the children
* of this dentry take up. */
}
}
-static int compare_names(const char *name_1, u16 len_1,
- const char *name_2, u16 len_2)
+static int
+compare_utf16le_names(const utf16lechar *name1, size_t nbytes1,
+ const utf16lechar *name2, size_t nbytes2)
{
- int result = strncasecmp(name_1, name_2, min(len_1, len_2));
- if (result) {
+ int result = memcmp(name1, name2, min(nbytes1, nbytes2));
+ if (result)
return result;
- } else {
- return (int)len_1 - (int)len_2;
- }
+ else
+ return (int)nbytes1 - (int)nbytes2;
}
-static int dentry_compare_names(const struct dentry *d1, const struct dentry *d2)
+static int
+dentry_compare_names(const struct wim_dentry *d1, const struct wim_dentry *d2)
{
- return compare_names(d1->file_name_utf8, d1->file_name_utf8_len,
- d2->file_name_utf8, d2->file_name_utf8_len);
+ return compare_utf16le_names(d1->file_name, d1->file_name_nbytes,
+ d2->file_name, d2->file_name_nbytes);
}
-static struct dentry *
-get_rbtree_child_with_name(const struct rb_node *node,
- const char *name, size_t name_len)
+struct wim_dentry *
+get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry,
+ const utf16lechar *name,
+ size_t name_nbytes)
{
- do {
- struct dentry *child = rbnode_dentry(node);
- int result = compare_names(name, name_len,
- child->file_name_utf8,
- child->file_name_utf8_len);
+ struct rb_node *node = dentry->d_inode->i_children.rb_node;
+ struct wim_dentry *child;
+ while (node) {
+ child = rbnode_dentry(node);
+ int result = compare_utf16le_names(name, name_nbytes,
+ child->file_name,
+ child->file_name_nbytes);
if (result < 0)
node = node->rb_left;
else if (result > 0)
node = node->rb_right;
else
return child;
- } while (node);
+ }
return NULL;
}
-/* Returns the child of @dentry that has the file name @name.
- * Returns NULL if no child has the name. */
-struct dentry *get_dentry_child_with_name(const struct dentry *dentry,
- const char *name)
+/* Returns the child of @dentry that has the file name @name. Returns NULL if
+ * no child has the name. */
+struct wim_dentry *
+get_dentry_child_with_name(const struct wim_dentry *dentry, const tchar *name)
{
- struct rb_node *node = dentry->d_inode->children.rb_node;
- if (node)
- return get_rbtree_child_with_name(node, name, strlen(name));
- else
- return NULL;
+#if TCHAR_IS_UTF16LE
+ return get_dentry_child_with_utf16le_name(dentry, name,
+ tstrlen(name) * sizeof(tchar));
+#else
+ utf16lechar *utf16le_name;
+ size_t utf16le_name_nbytes;
+ int ret;
+ struct wim_dentry *child;
+
+ ret = tstr_to_utf16le(name, tstrlen(name) * sizeof(tchar),
+ &utf16le_name, &utf16le_name_nbytes);
+ if (ret) {
+ child = NULL;
+ } else {
+ child = get_dentry_child_with_utf16le_name(dentry,
+ utf16le_name,
+ utf16le_name_nbytes);
+ FREE(utf16le_name);
+ }
+ return child;
+#endif
}
-/* Retrieves the dentry that has the UTF-8 @path relative to the dentry
- * @cur_dentry. Returns NULL if no dentry having the path is found. */
-static struct dentry *get_dentry_relative_path(struct dentry *cur_dentry,
- const char *path)
+static struct wim_dentry *
+get_dentry_utf16le(WIMStruct *w, const utf16lechar *path,
+ size_t path_nbytes)
{
- if (*path == '\0')
- return cur_dentry;
-
- struct rb_node *node = cur_dentry->d_inode->children.rb_node;
- if (node) {
- struct dentry *child;
- size_t base_len;
- const char *new_path;
+ struct wim_dentry *cur_dentry, *parent_dentry;
+ const utf16lechar *p, *pp;
- new_path = path_next_part(path, &base_len);
+ cur_dentry = parent_dentry = wim_root_dentry(w);
+ if (!cur_dentry) {
+ errno = ENOENT;
+ return NULL;
+ }
+ p = path;
+ while (1) {
+ while (*p == cpu_to_le16('/'))
+ p++;
+ if (*p == '\0')
+ break;
+ pp = p;
+ while (*pp != cpu_to_le16('/') && *pp != cpu_to_le16('\0'))
+ pp++;
- child = get_rbtree_child_with_name(node, path, base_len);
- if (child)
- return get_dentry_relative_path(child, new_path);
+ cur_dentry = get_dentry_child_with_utf16le_name(parent_dentry, p,
+ (void*)pp - (void*)p);
+ if (cur_dentry == NULL)
+ break;
+ p = pp;
+ parent_dentry = cur_dentry;
}
- return NULL;
+ if (cur_dentry == NULL) {
+ if (dentry_is_directory(parent_dentry))
+ errno = ENOENT;
+ else
+ errno = ENOTDIR;
+ }
+ return cur_dentry;
}
-/* Returns the dentry corresponding to the UTF-8 @path, or NULL if there is no
- * such dentry. */
-struct dentry *get_dentry(WIMStruct *w, const char *path)
+/* Returns the dentry corresponding to the @path, or NULL if there is no such
+ * dentry. */
+struct wim_dentry *
+get_dentry(WIMStruct *w, const tchar *path)
{
- struct dentry *root = wim_root_dentry(w);
- while (*path == '/')
- path++;
- return get_dentry_relative_path(root, path);
+#if TCHAR_IS_UTF16LE
+ return get_dentry_utf16le(w, path, tstrlen(path) * sizeof(tchar));
+#else
+ utf16lechar *path_utf16le;
+ size_t path_utf16le_nbytes;
+ int ret;
+ struct wim_dentry *dentry;
+
+ ret = tstr_to_utf16le(path, tstrlen(path) * sizeof(tchar),
+ &path_utf16le, &path_utf16le_nbytes);
+ if (ret)
+ return NULL;
+ dentry = get_dentry_utf16le(w, path_utf16le, path_utf16le_nbytes);
+ FREE(path_utf16le);
+ return dentry;
+#endif
}
-struct inode *wim_pathname_to_inode(WIMStruct *w, const char *path)
+struct wim_inode *
+wim_pathname_to_inode(WIMStruct *w, const tchar *path)
{
- struct dentry *dentry;
+ struct wim_dentry *dentry;
dentry = get_dentry(w, path);
if (dentry)
return dentry->d_inode;
return NULL;
}
+/* Takes in a path of length @len in @buf, and transforms it into a string for
+ * the path of its parent directory. */
+static void
+to_parent_name(tchar *buf, size_t len)
+{
+ ssize_t i = (ssize_t)len - 1;
+ while (i >= 0 && buf[i] == T('/'))
+ i--;
+ while (i >= 0 && buf[i] != T('/'))
+ i--;
+ while (i >= 0 && buf[i] == T('/'))
+ i--;
+ buf[i + 1] = T('\0');
+}
+
/* Returns the dentry that corresponds to the parent directory of @path, or NULL
* if the dentry is not found. */
-struct dentry *get_parent_dentry(WIMStruct *w, const char *path)
+struct wim_dentry *
+get_parent_dentry(WIMStruct *w, const tchar *path)
{
- size_t path_len = strlen(path);
- char buf[path_len + 1];
-
- memcpy(buf, path, path_len + 1);
+ size_t path_len = tstrlen(path);
+ tchar buf[path_len + 1];
+ tmemcpy(buf, path, path_len + 1);
to_parent_name(buf, path_len);
-
return get_dentry(w, buf);
}
/* Prints the full path of a dentry. */
-int print_dentry_full_path(struct dentry *dentry, void *ignore)
+int
+print_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
{
- if (dentry->full_path_utf8)
- puts(dentry->full_path_utf8);
+ int ret = calculate_dentry_full_path(dentry);
+ if (ret)
+ return ret;
+ tprintf(T("%"TS"\n"), dentry->_full_path);
return 0;
}
* set. */
struct file_attr_flag {
u32 flag;
- const char *name;
+ const tchar *name;
};
struct file_attr_flag file_attr_flags[] = {
- {FILE_ATTRIBUTE_READONLY, "READONLY"},
- {FILE_ATTRIBUTE_HIDDEN, "HIDDEN"},
- {FILE_ATTRIBUTE_SYSTEM, "SYSTEM"},
- {FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY"},
- {FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE"},
- {FILE_ATTRIBUTE_DEVICE, "DEVICE"},
- {FILE_ATTRIBUTE_NORMAL, "NORMAL"},
- {FILE_ATTRIBUTE_TEMPORARY, "TEMPORARY"},
- {FILE_ATTRIBUTE_SPARSE_FILE, "SPARSE_FILE"},
- {FILE_ATTRIBUTE_REPARSE_POINT, "REPARSE_POINT"},
- {FILE_ATTRIBUTE_COMPRESSED, "COMPRESSED"},
- {FILE_ATTRIBUTE_OFFLINE, "OFFLINE"},
- {FILE_ATTRIBUTE_NOT_CONTENT_INDEXED,"NOT_CONTENT_INDEXED"},
- {FILE_ATTRIBUTE_ENCRYPTED, "ENCRYPTED"},
- {FILE_ATTRIBUTE_VIRTUAL, "VIRTUAL"},
+ {FILE_ATTRIBUTE_READONLY, T("READONLY")},
+ {FILE_ATTRIBUTE_HIDDEN, T("HIDDEN")},
+ {FILE_ATTRIBUTE_SYSTEM, T("SYSTEM")},
+ {FILE_ATTRIBUTE_DIRECTORY, T("DIRECTORY")},
+ {FILE_ATTRIBUTE_ARCHIVE, T("ARCHIVE")},
+ {FILE_ATTRIBUTE_DEVICE, T("DEVICE")},
+ {FILE_ATTRIBUTE_NORMAL, T("NORMAL")},
+ {FILE_ATTRIBUTE_TEMPORARY, T("TEMPORARY")},
+ {FILE_ATTRIBUTE_SPARSE_FILE, T("SPARSE_FILE")},
+ {FILE_ATTRIBUTE_REPARSE_POINT, T("REPARSE_POINT")},
+ {FILE_ATTRIBUTE_COMPRESSED, T("COMPRESSED")},
+ {FILE_ATTRIBUTE_OFFLINE, T("OFFLINE")},
+ {FILE_ATTRIBUTE_NOT_CONTENT_INDEXED,T("NOT_CONTENT_INDEXED")},
+ {FILE_ATTRIBUTE_ENCRYPTED, T("ENCRYPTED")},
+ {FILE_ATTRIBUTE_VIRTUAL, T("VIRTUAL")},
};
/* Prints a directory entry. @lookup_table is a pointer to the lookup table, if
* available. If the dentry is unresolved and the lookup table is NULL, the
* lookup table entries will not be printed. Otherwise, they will be. */
-int print_dentry(struct dentry *dentry, void *lookup_table)
+int
+print_dentry(struct wim_dentry *dentry, void *lookup_table)
{
const u8 *hash;
- struct lookup_table_entry *lte;
- const struct inode *inode = dentry->d_inode;
- time_t time;
- char *p;
-
- printf("[DENTRY]\n");
- printf("Length = %"PRIu64"\n", dentry->length);
- printf("Attributes = 0x%x\n", inode->attributes);
- for (unsigned i = 0; i < ARRAY_LEN(file_attr_flags); i++)
- if (file_attr_flags[i].flag & inode->attributes)
- printf(" FILE_ATTRIBUTE_%s is set\n",
+ struct wim_lookup_table_entry *lte;
+ const struct wim_inode *inode = dentry->d_inode;
+ tchar buf[50];
+
+ tprintf(T("[DENTRY]\n"));
+ tprintf(T("Length = %"PRIu64"\n"), dentry->length);
+ tprintf(T("Attributes = 0x%x\n"), inode->i_attributes);
+ for (size_t i = 0; i < ARRAY_LEN(file_attr_flags); i++)
+ if (file_attr_flags[i].flag & inode->i_attributes)
+ tprintf(T(" FILE_ATTRIBUTE_%"TS" is set\n"),
file_attr_flags[i].name);
- printf("Security ID = %d\n", inode->security_id);
- printf("Subdir offset = %"PRIu64"\n", dentry->subdir_offset);
-
- /* Translate the timestamps into something readable */
- time = wim_timestamp_to_unix(inode->creation_time);
- p = asctime(gmtime(&time));
- *(strrchr(p, '\n')) = '\0';
- printf("Creation Time = %s UTC\n", p);
-
- time = wim_timestamp_to_unix(inode->last_access_time);
- p = asctime(gmtime(&time));
- *(strrchr(p, '\n')) = '\0';
- printf("Last Access Time = %s UTC\n", p);
-
- time = wim_timestamp_to_unix(inode->last_write_time);
- p = asctime(gmtime(&time));
- *(strrchr(p, '\n')) = '\0';
- printf("Last Write Time = %s UTC\n", p);
-
- printf("Reparse Tag = 0x%"PRIx32"\n", inode->reparse_tag);
- printf("Hard Link Group = 0x%"PRIx64"\n", inode->ino);
- printf("Hard Link Group Size = %"PRIu32"\n", inode->link_count);
- printf("Number of Alternate Data Streams = %hu\n", inode->num_ads);
- printf("Filename = \"");
- print_string(dentry->file_name, dentry->file_name_len);
- puts("\"");
- printf("Filename Length = %hu\n", dentry->file_name_len);
- printf("Filename (UTF-8) = \"%s\"\n", dentry->file_name_utf8);
- printf("Filename (UTF-8) Length = %hu\n", dentry->file_name_utf8_len);
- printf("Short Name = \"");
- print_string(dentry->short_name, dentry->short_name_len);
- puts("\"");
- printf("Short Name Length = %hu\n", dentry->short_name_len);
- printf("Full Path (UTF-8) = \"%s\"\n", dentry->full_path_utf8);
+ tprintf(T("Security ID = %d\n"), inode->i_security_id);
+ tprintf(T("Subdir offset = %"PRIu64"\n"), dentry->subdir_offset);
+
+ wim_timestamp_to_str(inode->i_creation_time, buf, sizeof(buf));
+ tprintf(T("Creation Time = %"TS"\n"), buf);
+
+ wim_timestamp_to_str(inode->i_last_access_time, buf, sizeof(buf));
+ tprintf(T("Last Access Time = %"TS"\n"), buf);
+
+ wim_timestamp_to_str(inode->i_last_write_time, buf, sizeof(buf));
+ tprintf(T("Last Write Time = %"TS"\n"), buf);
+
+ if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+ tprintf(T("Reparse Tag = 0x%"PRIx32"\n"), inode->i_reparse_tag);
+ tprintf(T("Reparse Point Flags = 0x%"PRIx16"\n"),
+ inode->i_not_rpfixed);
+ tprintf(T("Reparse Point Unknown 2 = 0x%"PRIx32"\n"),
+ inode->i_rp_unknown_2);
+ }
+ tprintf(T("Reparse Point Unknown 1 = 0x%"PRIx32"\n"),
+ inode->i_rp_unknown_1);
+ tprintf(T("Hard Link Group = 0x%"PRIx64"\n"), inode->i_ino);
+ tprintf(T("Hard Link Group Size = %"PRIu32"\n"), inode->i_nlink);
+ tprintf(T("Number of Alternate Data Streams = %hu\n"), inode->i_num_ads);
+ if (dentry_has_long_name(dentry))
+ wimlib_printf(T("Filename = \"%"WS"\"\n"), dentry->file_name);
+ if (dentry_has_short_name(dentry))
+ wimlib_printf(T("Short Name \"%"WS"\"\n"), dentry->short_name);
+ if (dentry->_full_path)
+ tprintf(T("Full Path = \"%"TS"\"\n"), dentry->_full_path);
+
lte = inode_stream_lte(dentry->d_inode, 0, lookup_table);
if (lte) {
- print_lookup_table_entry(lte);
+ print_lookup_table_entry(lte, stdout);
} else {
hash = inode_stream_hash(inode, 0);
if (hash) {
- printf("Hash = 0x");
- print_hash(hash);
- putchar('\n');
- putchar('\n');
+ tprintf(T("Hash = 0x"));
+ print_hash(hash, stdout);
+ tputchar(T('\n'));
+ tputchar(T('\n'));
}
}
- for (u16 i = 0; i < inode->num_ads; i++) {
- printf("[Alternate Stream Entry %u]\n", i);
- printf("Name = \"%s\"\n", inode->ads_entries[i].stream_name_utf8);
- printf("Name Length (UTF-16) = %u\n",
- inode->ads_entries[i].stream_name_len);
+ for (u16 i = 0; i < inode->i_num_ads; i++) {
+ tprintf(T("[Alternate Stream Entry %u]\n"), i);
+ wimlib_printf(T("Name = \"%"WS"\"\n"),
+ inode->i_ads_entries[i].stream_name);
+ tprintf(T("Name Length (UTF16 bytes) = %hu\n"),
+ inode->i_ads_entries[i].stream_name_nbytes);
hash = inode_stream_hash(inode, i + 1);
if (hash) {
- printf("Hash = 0x");
- print_hash(hash);
- putchar('\n');
+ tprintf(T("Hash = 0x"));
+ print_hash(hash, stdout);
+ tputchar(T('\n'));
}
- print_lookup_table_entry(inode_stream_lte(inode, i + 1,
- lookup_table));
+ print_lookup_table_entry(inode_stream_lte(inode, i + 1, lookup_table),
+ stdout);
}
return 0;
}
-/* Initializations done on every `struct dentry'. */
-static void dentry_common_init(struct dentry *dentry)
+/* Initializations done on every `struct wim_dentry'. */
+static void
+dentry_common_init(struct wim_dentry *dentry)
{
- memset(dentry, 0, sizeof(struct dentry));
- dentry->refcnt = 1;
+ memset(dentry, 0, sizeof(struct wim_dentry));
}
-static struct inode *new_timeless_inode()
+struct wim_inode *
+new_timeless_inode()
{
- struct inode *inode = CALLOC(1, sizeof(struct inode));
+ struct wim_inode *inode = CALLOC(1, sizeof(struct wim_inode));
if (inode) {
- inode->security_id = -1;
- inode->link_count = 1;
+ inode->i_security_id = -1;
+ inode->i_nlink = 1;
+ inode->i_next_stream_id = 1;
+ inode->i_not_rpfixed = 1;
+ INIT_LIST_HEAD(&inode->i_list);
#ifdef WITH_FUSE
- inode->next_stream_id = 1;
if (pthread_mutex_init(&inode->i_mutex, NULL) != 0) {
ERROR_WITH_ERRNO("Error initializing mutex");
FREE(inode);
return NULL;
}
#endif
- INIT_LIST_HEAD(&inode->dentry_list);
+ INIT_LIST_HEAD(&inode->i_dentry);
}
return inode;
}
-static struct inode *new_inode()
+static struct wim_inode *
+new_inode()
{
- struct inode *inode = new_timeless_inode();
+ struct wim_inode *inode = new_timeless_inode();
if (inode) {
u64 now = get_wim_timestamp();
- inode->creation_time = now;
- inode->last_access_time = now;
- inode->last_write_time = now;
+ inode->i_creation_time = now;
+ inode->i_last_access_time = now;
+ inode->i_last_write_time = now;
}
return inode;
}
-/*
- * Creates an unlinked directory entry.
- *
- * @name: The UTF-8 filename of the new dentry.
- *
- * Returns a pointer to the new dentry, or NULL if out of memory.
- */
-struct dentry *new_dentry(const char *name)
+/* Creates an unlinked directory entry. */
+int
+new_dentry(const tchar *name, struct wim_dentry **dentry_ret)
{
- struct dentry *dentry;
+ struct wim_dentry *dentry;
+ int ret;
- dentry = MALLOC(sizeof(struct dentry));
+ dentry = MALLOC(sizeof(struct wim_dentry));
if (!dentry)
- goto err;
+ return WIMLIB_ERR_NOMEM;
dentry_common_init(dentry);
- if (change_dentry_name(dentry, name) != 0)
- goto err;
-
- dentry->parent = dentry;
-
- return dentry;
-err:
- FREE(dentry);
- ERROR("Failed to allocate new dentry");
- return NULL;
+ ret = set_dentry_name(dentry, name);
+ if (ret == 0) {
+ dentry->parent = dentry;
+ *dentry_ret = dentry;
+ } else {
+ FREE(dentry);
+ ERROR("Failed to set name on new dentry with name \"%"TS"\"",
+ name);
+ }
+ return ret;
}
-static struct dentry *__new_dentry_with_inode(const char *name, bool timeless)
+static int
+__new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret,
+ bool timeless)
{
- struct dentry *dentry;
- dentry = new_dentry(name);
- if (dentry) {
- if (timeless)
- dentry->d_inode = new_timeless_inode();
- else
- dentry->d_inode = new_inode();
- if (dentry->d_inode) {
- inode_add_dentry(dentry, dentry->d_inode);
- } else {
- free_dentry(dentry);
- dentry = NULL;
- }
+ struct wim_dentry *dentry;
+ int ret;
+
+ ret = new_dentry(name, &dentry);
+ if (ret)
+ return ret;
+
+ if (timeless)
+ dentry->d_inode = new_timeless_inode();
+ else
+ dentry->d_inode = new_inode();
+ if (!dentry->d_inode) {
+ free_dentry(dentry);
+ return WIMLIB_ERR_NOMEM;
}
- return dentry;
+
+ inode_add_dentry(dentry, dentry->d_inode);
+ *dentry_ret = dentry;
+ return 0;
}
-struct dentry *new_dentry_with_timeless_inode(const char *name)
+int
+new_dentry_with_timeless_inode(const tchar *name, struct wim_dentry **dentry_ret)
{
- return __new_dentry_with_inode(name, true);
+ return __new_dentry_with_inode(name, dentry_ret, true);
}
-struct dentry *new_dentry_with_inode(const char *name)
+int
+new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret)
{
- return __new_dentry_with_inode(name, false);
+ return __new_dentry_with_inode(name, dentry_ret, false);
}
+int
+new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret)
+{
+ int ret;
+ struct wim_dentry *dentry;
-static int init_ads_entry(struct ads_entry *ads_entry, const char *name)
+ DEBUG("Creating filler directory \"%"TS"\"", name);
+ ret = new_dentry_with_inode(name, &dentry);
+ if (ret)
+ goto out;
+ /* Leave the inode number as 0; this is allowed for non
+ * hard-linked files. */
+ dentry->d_inode->i_resolved = 1;
+ dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
+ *dentry_ret = dentry;
+ ret = 0;
+out:
+ return ret;
+}
+
+static int
+init_ads_entry(struct wim_ads_entry *ads_entry, const void *name,
+ size_t name_nbytes, bool is_utf16le)
{
int ret = 0;
memset(ads_entry, 0, sizeof(*ads_entry));
- if (name && *name)
- ret = change_ads_name(ads_entry, name);
+
+ if (is_utf16le) {
+ utf16lechar *p = MALLOC(name_nbytes + sizeof(utf16lechar));
+ if (!p)
+ return WIMLIB_ERR_NOMEM;
+ memcpy(p, name, name_nbytes);
+ p[name_nbytes / 2] = 0;
+ ads_entry->stream_name = p;
+ ads_entry->stream_name_nbytes = name_nbytes;
+ } else {
+ if (name && *(const tchar*)name != T('\0')) {
+ ret = get_utf16le_name(name, &ads_entry->stream_name,
+ &ads_entry->stream_name_nbytes);
+ }
+ }
return ret;
}
-static void destroy_ads_entry(struct ads_entry *ads_entry)
+static void
+destroy_ads_entry(struct wim_ads_entry *ads_entry)
{
FREE(ads_entry->stream_name);
- FREE(ads_entry->stream_name_utf8);
}
-
/* Frees an inode. */
-void free_inode(struct inode *inode)
+void
+free_inode(struct wim_inode *inode)
{
if (inode) {
- if (inode->ads_entries) {
- for (u16 i = 0; i < inode->num_ads; i++)
- destroy_ads_entry(&inode->ads_entries[i]);
- FREE(inode->ads_entries);
+ if (inode->i_ads_entries) {
+ for (u16 i = 0; i < inode->i_num_ads; i++)
+ destroy_ads_entry(&inode->i_ads_entries[i]);
+ FREE(inode->i_ads_entries);
}
#ifdef WITH_FUSE
- wimlib_assert(inode->num_opened_fds == 0);
- FREE(inode->fds);
+ wimlib_assert(inode->i_num_opened_fds == 0);
+ FREE(inode->i_fds);
pthread_mutex_destroy(&inode->i_mutex);
#endif
- FREE(inode->extracted_file);
+ /* HACK: This may instead delete the inode from i_list, but the
+ * hlist_del() behaves the same as list_del(). */
+ hlist_del(&inode->i_hlist);
+ FREE(inode->i_extracted_file);
FREE(inode);
}
}
/* Decrements link count on an inode and frees it if the link count reaches 0.
* */
-static void put_inode(struct inode *inode)
+static void
+put_inode(struct wim_inode *inode)
{
- wimlib_assert(inode);
- wimlib_assert(inode->link_count);
- if (--inode->link_count == 0) {
+ wimlib_assert(inode->i_nlink != 0);
+ if (--inode->i_nlink == 0) {
#ifdef WITH_FUSE
- if (inode->num_opened_fds == 0)
+ if (inode->i_num_opened_fds == 0)
#endif
{
free_inode(inode);
/* Frees a WIM dentry.
*
- * The inode is freed only if its link count is decremented to 0.
+ * The corresponding inode (if any) is freed only if its link count is
+ * decremented to 0.
*/
-void free_dentry(struct dentry *dentry)
+void
+free_dentry(struct wim_dentry *dentry)
{
- wimlib_assert(dentry != NULL);
FREE(dentry->file_name);
- FREE(dentry->file_name_utf8);
FREE(dentry->short_name);
- FREE(dentry->full_path_utf8);
+ FREE(dentry->_full_path);
if (dentry->d_inode)
put_inode(dentry->d_inode);
FREE(dentry);
}
-void put_dentry(struct dentry *dentry)
+/* This function is passed as an argument to for_dentry_in_tree_depth() in order
+ * to free a directory tree. */
+static int
+do_free_dentry(struct wim_dentry *dentry, void *__lookup_table)
{
- wimlib_assert(dentry != NULL);
- wimlib_assert(dentry->refcnt != 0);
-
- if (--dentry->refcnt == 0)
- free_dentry(dentry);
-}
-
-/*
- * This function is passed as an argument to for_dentry_in_tree_depth() in order
- * to free a directory tree. __args is a pointer to a `struct free_dentry_args'.
- */
-static int do_free_dentry(struct dentry *dentry, void *__lookup_table)
-{
- struct lookup_table *lookup_table = __lookup_table;
+ struct wim_lookup_table *lookup_table = __lookup_table;
unsigned i;
if (lookup_table) {
- struct lookup_table_entry *lte;
- struct inode *inode = dentry->d_inode;
- wimlib_assert(inode->link_count);
- for (i = 0; i <= inode->num_ads; i++) {
+ struct wim_lookup_table_entry *lte;
+ struct wim_inode *inode = dentry->d_inode;
+ wimlib_assert(inode->i_nlink != 0);
+ for (i = 0; i <= inode->i_num_ads; i++) {
lte = inode_stream_lte(inode, i, lookup_table);
if (lte)
lte_decrement_refcnt(lte, lookup_table);
}
}
-
- put_dentry(dentry);
+ free_dentry(dentry);
return 0;
}
* table entries corresponding to the dentries will be
* decremented.
*/
-void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table)
+void
+free_dentry_tree(struct wim_dentry *root, struct wim_lookup_table *lookup_table)
{
- if (!root || !root->parent)
- return;
for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
}
-int increment_dentry_refcnt(struct dentry *dentry, void *ignore)
-{
- dentry->refcnt++;
- return 0;
-}
-
/*
* Links a dentry into the directory tree.
*
- * @dentry: The dentry to link.
* @parent: The dentry that will be the parent of @dentry.
+ * @dentry: The dentry to link.
*/
-bool dentry_add_child(struct dentry * restrict parent,
- struct dentry * restrict child)
+struct wim_dentry *
+dentry_add_child(struct wim_dentry * restrict parent,
+ struct wim_dentry * restrict child)
{
wimlib_assert(dentry_is_directory(parent));
- struct rb_root *root = &parent->d_inode->children;
+ struct rb_root *root = &parent->d_inode->i_children;
struct rb_node **new = &(root->rb_node);
struct rb_node *rb_parent = NULL;
while (*new) {
- struct dentry *this = rbnode_dentry(*new);
+ struct wim_dentry *this = rbnode_dentry(*new);
int result = dentry_compare_names(child, this);
rb_parent = *new;
else if (result > 0)
new = &((*new)->rb_right);
else
- return false;
+ return this;
}
child->parent = parent;
rb_link_node(&child->rb_node, rb_parent, new);
rb_insert_color(&child->rb_node, root);
- return true;
+ return NULL;
}
-#ifdef WITH_FUSE
-/*
- * Unlink a dentry from the directory tree.
- *
- * Note: This merely removes it from the in-memory tree structure.
- */
-void unlink_dentry(struct dentry *dentry)
+/* Unlink a WIM dentry from the directory entry tree. */
+void
+unlink_dentry(struct wim_dentry *dentry)
{
- struct dentry *parent = dentry->parent;
+ struct wim_dentry *parent = dentry->parent;
if (parent == dentry)
return;
- rb_erase(&dentry->rb_node, &parent->d_inode->children);
-}
-#endif
-
-static inline struct dentry *inode_first_dentry(struct inode *inode)
-{
- wimlib_assert(inode->dentry_list.next != &inode->dentry_list);
- return container_of(inode->dentry_list.next, struct dentry,
- inode_dentry_list);
+ rb_erase(&dentry->rb_node, &parent->d_inode->i_children);
}
-static int verify_inode(struct inode *inode, const WIMStruct *w)
-{
- const struct lookup_table *table = w->lookup_table;
- const struct wim_security_data *sd = wim_const_security_data(w);
- const struct dentry *first_dentry = inode_first_dentry(inode);
- int ret = WIMLIB_ERR_INVALID_DENTRY;
-
- /* Check the security ID */
- if (inode->security_id < -1) {
- ERROR("Dentry `%s' has an invalid security ID (%d)",
- first_dentry->full_path_utf8, inode->security_id);
- goto out;
- }
- if (inode->security_id >= sd->num_entries) {
- ERROR("Dentry `%s' has an invalid security ID (%d) "
- "(there are only %u entries in the security table)",
- first_dentry->full_path_utf8, inode->security_id,
- sd->num_entries);
- goto out;
- }
-
- /* Check that lookup table entries for all the resources exist, except
- * if the SHA1 message digest is all 0's, which indicates there is
- * intentionally no resource there. */
- if (w->hdr.total_parts == 1) {
- for (unsigned i = 0; i <= inode->num_ads; i++) {
- struct lookup_table_entry *lte;
- const u8 *hash;
- hash = inode_stream_hash_unresolved(inode, i);
- lte = __lookup_resource(table, hash);
- if (!lte && !is_zero_hash(hash)) {
- ERROR("Could not find lookup table entry for stream "
- "%u of dentry `%s'", i, first_dentry->full_path_utf8);
- goto out;
- }
- if (lte && (lte->real_refcnt += inode->link_count) > lte->refcnt)
- {
- #ifdef ENABLE_ERROR_MESSAGES
- WARNING("The following lookup table entry "
- "has a reference count of %u, but",
- lte->refcnt);
- WARNING("We found %u references to it",
- lte->real_refcnt);
- WARNING("(One dentry referencing it is at `%s')",
- first_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.
- * (Unfortunately, even after doing this, the
- * reference count could be too low if it's also
- * referenced in other WIM images) */
-
- #if 1
- lte->refcnt = lte->real_refcnt;
- WARNING("Fixing reference count");
- #else
- goto out;
- #endif
- }
- }
- }
-
- /* Make sure there is only one un-named stream. */
- unsigned num_unnamed_streams = 0;
- for (unsigned i = 0; i <= inode->num_ads; i++) {
- const u8 *hash;
- hash = inode_stream_hash_unresolved(inode, i);
- if (!inode_stream_name_len(inode, i) && !is_zero_hash(hash))
- num_unnamed_streams++;
- }
- if (num_unnamed_streams > 1) {
- ERROR("Dentry `%s' has multiple (%u) un-named streams",
- first_dentry->full_path_utf8, num_unnamed_streams);
- goto out;
- }
- inode->verified = true;
- ret = 0;
-out:
- return ret;
-}
-
-/* Run some miscellaneous verifications on a WIM dentry */
-int verify_dentry(struct dentry *dentry, void *wim)
+/*
+ * Returns the alternate data stream entry belonging to @inode that has the
+ * stream name @stream_name.
+ */
+struct wim_ads_entry *
+inode_get_ads_entry(struct wim_inode *inode, const tchar *stream_name,
+ u16 *idx_ret)
{
- int ret;
+ if (inode->i_num_ads == 0) {
+ return NULL;
+ } else {
+ size_t stream_name_utf16le_nbytes;
+ u16 i;
+ struct wim_ads_entry *result;
- if (!dentry->d_inode->verified) {
- ret = verify_inode(dentry->d_inode, wim);
- if (ret != 0)
- return ret;
- }
+ #if TCHAR_IS_UTF16LE
+ const utf16lechar *stream_name_utf16le;
- /* Cannot have a short name but no long name */
- if (dentry->short_name_len && !dentry->file_name_len) {
- ERROR("Dentry `%s' has a short name but no long name",
- dentry->full_path_utf8);
- return WIMLIB_ERR_INVALID_DENTRY;
- }
+ stream_name_utf16le = stream_name;
+ stream_name_utf16le_nbytes = tstrlen(stream_name) * sizeof(tchar);
+ #else
+ utf16lechar *stream_name_utf16le;
- /* Make sure root dentry is unnamed */
- if (dentry_is_root(dentry)) {
- if (dentry->file_name_len) {
- ERROR("The root dentry is named `%s', but it must "
- "be unnamed", dentry->file_name_utf8);
- return WIMLIB_ERR_INVALID_DENTRY;
+ {
+ int ret = tstr_to_utf16le(stream_name,
+ tstrlen(stream_name) *
+ sizeof(tchar),
+ &stream_name_utf16le,
+ &stream_name_utf16le_nbytes);
+ if (ret)
+ return NULL;
}
- }
-
-#if 0
- /* Check timestamps */
- if (inode->last_access_time < inode->creation_time ||
- inode->last_write_time < inode->creation_time) {
- WARNING("Dentry `%s' was created after it was last accessed or "
- "written to", dentry->full_path_utf8);
- }
-#endif
-
- return 0;
-}
-
-
-#ifdef WITH_FUSE
-/* Returns the alternate data stream entry belonging to @inode that has the
- * stream name @stream_name. */
-struct ads_entry *inode_get_ads_entry(struct inode *inode,
- const char *stream_name,
- u16 *idx_ret)
-{
- size_t stream_name_len;
- if (!stream_name)
- return NULL;
- if (inode->num_ads) {
- u16 i = 0;
- stream_name_len = strlen(stream_name);
+ #endif
+ i = 0;
+ result = NULL;
do {
- if (ads_entry_has_name(&inode->ads_entries[i],
- stream_name, stream_name_len))
+ if (ads_entry_has_name(&inode->i_ads_entries[i],
+ stream_name_utf16le,
+ stream_name_utf16le_nbytes))
{
if (idx_ret)
*idx_ret = i;
- return &inode->ads_entries[i];
+ result = &inode->i_ads_entries[i];
+ break;
}
- } while (++i != inode->num_ads);
+ } while (++i != inode->i_num_ads);
+ #if !TCHAR_IS_UTF16LE
+ FREE(stream_name_utf16le);
+ #endif
+ return result;
}
- return NULL;
}
-#endif
-#if defined(WITH_FUSE) || defined(WITH_NTFS_3G)
-/*
- * Add an alternate stream entry to an inode and return a pointer to it, or NULL
- * if memory could not be allocated.
- */
-struct ads_entry *inode_add_ads(struct inode *inode, const char *stream_name)
+static struct wim_ads_entry *
+do_inode_add_ads(struct wim_inode *inode, const void *stream_name,
+ size_t stream_name_nbytes, bool is_utf16le)
{
u16 num_ads;
- struct ads_entry *ads_entries;
- struct ads_entry *new_entry;
-
- DEBUG("Add alternate data stream \"%s\"", stream_name);
+ struct wim_ads_entry *ads_entries;
+ struct wim_ads_entry *new_entry;
- if (inode->num_ads >= 0xfffe) {
+ if (inode->i_num_ads >= 0xfffe) {
ERROR("Too many alternate data streams in one inode!");
return NULL;
}
- num_ads = inode->num_ads + 1;
- ads_entries = REALLOC(inode->ads_entries,
- num_ads * sizeof(inode->ads_entries[0]));
+ num_ads = inode->i_num_ads + 1;
+ ads_entries = REALLOC(inode->i_ads_entries,
+ num_ads * sizeof(inode->i_ads_entries[0]));
if (!ads_entries) {
ERROR("Failed to allocate memory for new alternate data stream");
return NULL;
}
- inode->ads_entries = ads_entries;
+ inode->i_ads_entries = ads_entries;
- new_entry = &inode->ads_entries[num_ads - 1];
- if (init_ads_entry(new_entry, stream_name) != 0)
+ new_entry = &inode->i_ads_entries[num_ads - 1];
+ if (init_ads_entry(new_entry, stream_name, stream_name_nbytes, is_utf16le))
return NULL;
-#ifdef WITH_FUSE
- new_entry->stream_id = inode->next_stream_id++;
-#endif
- inode->num_ads = num_ads;
+ new_entry->stream_id = inode->i_next_stream_id++;
+ inode->i_num_ads = num_ads;
return new_entry;
}
-#endif
-#ifdef WITH_FUSE
-/* Remove an alternate data stream from the inode */
-void inode_remove_ads(struct inode *inode, u16 idx,
- struct lookup_table *lookup_table)
+struct wim_ads_entry *
+inode_add_ads_utf16le(struct wim_inode *inode,
+ const utf16lechar *stream_name,
+ size_t stream_name_nbytes)
+{
+ DEBUG("Add alternate data stream \"%"WS"\"", stream_name);
+ return do_inode_add_ads(inode, stream_name, stream_name_nbytes, true);
+}
+
+/*
+ * Add an alternate stream entry to a WIM inode and return a pointer to it, or
+ * NULL if memory could not be allocated.
+ */
+struct wim_ads_entry *
+inode_add_ads(struct wim_inode *inode, const tchar *stream_name)
+{
+ DEBUG("Add alternate data stream \"%"TS"\"", stream_name);
+ return do_inode_add_ads(inode, stream_name,
+ tstrlen(stream_name) * sizeof(tchar),
+ TCHAR_IS_UTF16LE);
+}
+
+int
+inode_add_ads_with_data(struct wim_inode *inode, const tchar *name,
+ const void *value, size_t size,
+ struct wim_lookup_table *lookup_table)
+{
+ int ret = WIMLIB_ERR_NOMEM;
+ struct wim_ads_entry *new_ads_entry;
+ struct wim_lookup_table_entry *existing_lte;
+ struct wim_lookup_table_entry *lte;
+ u8 value_hash[SHA1_HASH_SIZE];
+
+ wimlib_assert(inode->i_resolved);
+ new_ads_entry = inode_add_ads(inode, name);
+ if (!new_ads_entry)
+ goto out;
+ sha1_buffer((const u8*)value, size, value_hash);
+ existing_lte = __lookup_resource(lookup_table, value_hash);
+ if (existing_lte) {
+ lte = existing_lte;
+ lte->refcnt++;
+ } else {
+ u8 *value_copy;
+ lte = new_lookup_table_entry();
+ if (!lte)
+ goto out_remove_ads_entry;
+ value_copy = MALLOC(size);
+ if (!value_copy) {
+ FREE(lte);
+ goto out_remove_ads_entry;
+ }
+ 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;
+ copy_hash(lte->hash, value_hash);
+ lookup_table_insert(lookup_table, lte);
+ }
+ new_ads_entry->lte = lte;
+ ret = 0;
+ goto out;
+out_remove_ads_entry:
+ inode_remove_ads(inode, new_ads_entry - inode->i_ads_entries,
+ lookup_table);
+out:
+ return ret;
+}
+
+/* Set the unnamed stream of a WIM inode, given a data buffer containing the
+ * stream contents. */
+int
+inode_set_unnamed_stream(struct wim_inode *inode, const void *data, size_t len,
+ struct wim_lookup_table *lookup_table)
+{
+ struct wim_lookup_table_entry *lte, *existing_lte;
+ u8 hash[SHA1_HASH_SIZE];
+ void *buf;
+
+ sha1_buffer(data, len, hash);
+ existing_lte = __lookup_resource(lookup_table, hash);
+ if (existing_lte) {
+ wimlib_assert(wim_resource_size(existing_lte) == len);
+ lte = existing_lte;
+ lte->refcnt++;
+ } else {
+ lte = new_lookup_table_entry();
+ if (!lte)
+ return WIMLIB_ERR_NOMEM;
+ buf = MALLOC(len);
+ if (!buf) {
+ free_lookup_table_entry(lte);
+ return WIMLIB_ERR_NOMEM;
+ }
+ memcpy(buf, data, len);
+ lte->resource_location = RESOURCE_IN_ATTACHED_BUFFER;
+ lte->attached_buffer = buf;
+ lte->resource_entry.original_size = len;
+ copy_hash(lte->hash, hash);
+ lookup_table_insert(lookup_table, lte);
+ }
+ inode->i_lte = lte;
+ inode->i_resolved = 1;
+ return 0;
+}
+
+/* Remove an alternate data stream from a WIM inode */
+void
+inode_remove_ads(struct wim_inode *inode, u16 idx,
+ struct wim_lookup_table *lookup_table)
{
- struct ads_entry *ads_entry;
- struct lookup_table_entry *lte;
+ struct wim_ads_entry *ads_entry;
+ struct wim_lookup_table_entry *lte;
- wimlib_assert(idx < inode->num_ads);
- wimlib_assert(inode->resolved);
+ wimlib_assert(idx < inode->i_num_ads);
+ wimlib_assert(inode->i_resolved);
- ads_entry = &inode->ads_entries[idx];
+ ads_entry = &inode->i_ads_entries[idx];
- DEBUG("Remove alternate data stream \"%s\"", ads_entry->stream_name_utf8);
+ DEBUG("Remove alternate data stream \"%"WS"\"", ads_entry->stream_name);
lte = ads_entry->lte;
if (lte)
destroy_ads_entry(ads_entry);
- memcpy(&inode->ads_entries[idx],
- &inode->ads_entries[idx + 1],
- (inode->num_ads - idx - 1) * sizeof(inode->ads_entries[0]));
- inode->num_ads--;
+ memmove(&inode->i_ads_entries[idx],
+ &inode->i_ads_entries[idx + 1],
+ (inode->i_num_ads - idx - 1) * sizeof(inode->i_ads_entries[0]));
+ inode->i_num_ads--;
}
-#endif
+#ifndef __WIN32__
+int
+inode_get_unix_data(const struct wim_inode *inode,
+ struct wimlib_unix_data *unix_data,
+ u16 *stream_idx_ret)
+{
+ const struct wim_ads_entry *ads_entry;
+ const struct wim_lookup_table_entry *lte;
+ size_t size;
+ int ret;
+
+ wimlib_assert(inode->i_resolved);
+
+ ads_entry = inode_get_ads_entry((struct wim_inode*)inode,
+ WIMLIB_UNIX_DATA_TAG, NULL);
+ if (!ads_entry)
+ return NO_UNIX_DATA;
+
+ if (stream_idx_ret)
+ *stream_idx_ret = ads_entry - inode->i_ads_entries;
+
+ lte = ads_entry->lte;
+ if (!lte)
+ return NO_UNIX_DATA;
+
+ size = wim_resource_size(lte);
+ if (size != sizeof(struct wimlib_unix_data))
+ return BAD_UNIX_DATA;
+
+ ret = read_full_resource_into_buf(lte, unix_data);
+ if (ret)
+ return ret;
+
+ if (unix_data->version != 0)
+ return BAD_UNIX_DATA;
+ return 0;
+}
+int
+inode_set_unix_data(struct wim_inode *inode, uid_t uid, gid_t gid, mode_t mode,
+ struct wim_lookup_table *lookup_table, int which)
+{
+ struct wimlib_unix_data unix_data;
+ int ret;
+ bool have_good_unix_data = false;
+ bool have_unix_data = false;
+ u16 stream_idx;
+
+ if (!(which & UNIX_DATA_CREATE)) {
+ ret = inode_get_unix_data(inode, &unix_data, &stream_idx);
+ if (ret == 0 || ret == BAD_UNIX_DATA || ret > 0)
+ have_unix_data = true;
+ if (ret == 0)
+ have_good_unix_data = true;
+ }
+ unix_data.version = 0;
+ if (which & UNIX_DATA_UID || !have_good_unix_data)
+ unix_data.uid = uid;
+ if (which & UNIX_DATA_GID || !have_good_unix_data)
+ unix_data.gid = gid;
+ if (which & UNIX_DATA_MODE || !have_good_unix_data)
+ unix_data.mode = mode;
+ ret = inode_add_ads_with_data(inode, WIMLIB_UNIX_DATA_TAG,
+ &unix_data,
+ sizeof(struct wimlib_unix_data),
+ lookup_table);
+ if (ret == 0 && have_unix_data)
+ inode_remove_ads(inode, stream_idx, lookup_table);
+ return ret;
+}
+#endif /* !__WIN32__ */
+
+/* Replace weird characters in filenames and alternate data stream names.
+ *
+ * In particular we do not want the path separator to appear in any names, as
+ * that would make it possible for a "malicious" WIM to extract itself to any
+ * location it wanted to. */
+static void
+replace_forbidden_characters(utf16lechar *name)
+{
+ utf16lechar *p;
+
+ for (p = name; *p; p++) {
+ #ifdef __WIN32__
+ if (wcschr(L"<>:\"/\\|?*", (wchar_t)*p))
+ #else
+ if (*p == cpu_to_le16('/'))
+ #endif
+ {
+ #ifdef __WIN32__
+ *p = cpu_to_le16(0xfffd);
+ #else
+ *p = cpu_to_le16('?');
+ #endif
+ if (name) {
+ WARNING("File, directory, or stream name \"%"WS"\"\n"
+ " contains forbidden characters; "
+ "substituting replacement characters.",
+ name);
+ name = NULL;
+ }
+ }
+ }
+}
/*
- * Reads the alternate data stream entries for a dentry.
+ * Reads the alternate data stream entries of a WIM dentry.
*
* @p: Pointer to buffer that starts with the first alternate stream entry.
*
* @inode: Inode to load the alternate data streams into.
- * @inode->num_ads must have been set to the number of
+ * @inode->i_num_ads must have been set to the number of
* alternate data streams that are expected.
*
* @remaining_size: Number of bytes of data remaining in the buffer pointed
*
* The format of the on-disk alternate stream entries is as follows:
*
- * struct ads_entry_on_disk {
+ * struct wim_ads_entry_on_disk {
* u64 length; // Length of the entry, in bytes. This includes
* all fields (including the stream name and
* null terminator if present, AND the padding!).
*
* In addition, the entries are 8-byte aligned.
*
- * Return 0 on success or nonzero on failure. On success, inode->ads_entries
- * is set to an array of `struct ads_entry's of length inode->num_ads. On
+ * Return 0 on success or nonzero on failure. On success, inode->i_ads_entries
+ * is set to an array of `struct wim_ads_entry's of length inode->i_num_ads. On
* failure, @inode is not modified.
*/
-static int read_ads_entries(const u8 *p, struct inode *inode,
- u64 remaining_size)
+static int
+read_ads_entries(const u8 *p, struct wim_inode *inode, u64 remaining_size)
{
u16 num_ads;
- struct ads_entry *ads_entries;
+ struct wim_ads_entry *ads_entries;
int ret;
- num_ads = inode->num_ads;
- ads_entries = CALLOC(num_ads, sizeof(inode->ads_entries[0]));
+ num_ads = inode->i_num_ads;
+ ads_entries = CALLOC(num_ads, sizeof(inode->i_ads_entries[0]));
if (!ads_entries) {
ERROR("Could not allocate memory for %"PRIu16" "
"alternate data stream entries", num_ads);
}
for (u16 i = 0; i < num_ads; i++) {
- struct ads_entry *cur_entry;
+ struct wim_ads_entry *cur_entry;
u64 length;
u64 length_no_padding;
u64 total_length;
- size_t utf8_len;
const u8 *p_save = p;
cur_entry = &ads_entries[i];
}
p = get_u64(p, &length);
- p += 8; /* Skip the reserved field */
- p = get_bytes(p, SHA1_HASH_SIZE, (u8*)cur_entry->hash);
- p = get_u16(p, &cur_entry->stream_name_len);
+ p = get_u64(p, &cur_entry->unused);
+ p = get_bytes(p, SHA1_HASH_SIZE, cur_entry->hash);
+ p = get_u16(p, &cur_entry->stream_name_nbytes);
cur_entry->stream_name = NULL;
- cur_entry->stream_name_utf8 = NULL;
/* Length including neither the null terminator nor the padding
* */
length_no_padding = WIM_ADS_ENTRY_DISK_SIZE +
- cur_entry->stream_name_len;
+ cur_entry->stream_name_nbytes;
/* Length including the null terminator and the padding */
total_length = ((length_no_padding + 2) + 7) & ~7;
goto out_free_ads_entries;
}
- if (cur_entry->stream_name_len) {
- cur_entry->stream_name = MALLOC(cur_entry->stream_name_len);
+ if (cur_entry->stream_name_nbytes) {
+ cur_entry->stream_name = MALLOC(cur_entry->stream_name_nbytes + 2);
if (!cur_entry->stream_name) {
ret = WIMLIB_ERR_NOMEM;
goto out_free_ads_entries;
}
- get_bytes(p, cur_entry->stream_name_len,
- (u8*)cur_entry->stream_name);
- cur_entry->stream_name_utf8 = utf16_to_utf8(cur_entry->stream_name,
- cur_entry->stream_name_len,
- &utf8_len);
- cur_entry->stream_name_utf8_len = utf8_len;
-
- if (!cur_entry->stream_name_utf8) {
- ret = WIMLIB_ERR_NOMEM;
- goto out_free_ads_entries;
- }
+ get_bytes(p, cur_entry->stream_name_nbytes,
+ cur_entry->stream_name);
+ cur_entry->stream_name[cur_entry->stream_name_nbytes / 2] = 0;
+ replace_forbidden_characters(cur_entry->stream_name);
}
/* It's expected that the size of every ADS entry is a multiple
* of 8. However, to be safe, I'm allowing the possibility of
else
remaining_size -= total_length;
}
- inode->ads_entries = ads_entries;
+ inode->i_ads_entries = ads_entries;
#ifdef WITH_FUSE
- inode->next_stream_id = inode->num_ads + 1;
+ inode->i_next_stream_id = inode->i_num_ads + 1;
#endif
return 0;
out_free_ads_entries:
}
/*
- * Reads a directory entry, including all alternate data stream entries that
+ * Reads a WIM directory entry, including all alternate data stream entries that
* follow it, from the WIM image's metadata resource.
*
* @metadata_resource: Buffer containing the uncompressed metadata resource.
* @metadata_resource_len: Length of the metadata resource.
* @offset: Offset of this directory entry in the metadata resource.
- * @dentry: A `struct dentry' that will be filled in by this function.
+ * @dentry: A `struct wim_dentry' that will be filled in by this function.
*
- * Return 0 on success or nonzero on failure. On failure, @dentry have been
- * modified, bu it will be left with no pointers to any allocated buffers.
- * On success, the dentry->length field must be examined. If zero, this was a
- * special "end of directory" dentry and not a real dentry. If nonzero, this
- * was a real dentry.
+ * Return 0 on success or nonzero on failure. On failure, @dentry will have
+ * been modified, but it will not be left with pointers to any allocated
+ * buffers. On success, the dentry->length field must be examined. If zero,
+ * this was a special "end of directory" dentry and not a real dentry. If
+ * nonzero, this was a real dentry.
*/
-int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
- u64 offset, struct dentry *dentry)
+int
+read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
+ u64 offset, struct wim_dentry *dentry)
{
const u8 *p;
u64 calculated_size;
- char *file_name = NULL;
- char *file_name_utf8 = NULL;
- char *short_name = NULL;
- u16 short_name_len;
- u16 file_name_len;
- size_t file_name_utf8_len = 0;
+ utf16lechar *file_name = NULL;
+ utf16lechar *short_name = NULL;
+ u16 short_name_nbytes;
+ u16 file_name_nbytes;
int ret;
- struct inode *inode = NULL;
+ struct wim_inode *inode = NULL;
dentry_common_init(dentry);
if (!inode)
return WIMLIB_ERR_NOMEM;
- p = get_u32(p, &inode->attributes);
- p = get_u32(p, (u32*)&inode->security_id);
+ p = get_u32(p, &inode->i_attributes);
+ p = get_u32(p, (u32*)&inode->i_security_id);
p = get_u64(p, &dentry->subdir_offset);
- /* 2 unused fields */
- p += 2 * sizeof(u64);
- /*p = get_u64(p, &dentry->unused1);*/
- /*p = get_u64(p, &dentry->unused2);*/
+ p = get_u64(p, &inode->i_unused_1);
+ p = get_u64(p, &inode->i_unused_2);
- p = get_u64(p, &inode->creation_time);
- p = get_u64(p, &inode->last_access_time);
- p = get_u64(p, &inode->last_write_time);
+ p = get_u64(p, &inode->i_creation_time);
+ p = get_u64(p, &inode->i_last_access_time);
+ p = get_u64(p, &inode->i_last_write_time);
- p = get_bytes(p, SHA1_HASH_SIZE, inode->hash);
+ p = get_bytes(p, SHA1_HASH_SIZE, inode->i_hash);
- /*
- * I don't know what's going on here. It seems like M$ screwed up the
+ /* I don't know what's going on here. It seems like M$ screwed up the
* reparse points, then put the fields in the same place and didn't
- * document it. The WIM_HDR_FLAG_RP_FIX flag in the WIM header might
- * have something to do with this, but it's not documented.
- */
- if (inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
- /* ??? */
- p += 4;
- p = get_u32(p, &inode->reparse_tag);
- p += 4;
+ * document it. */
+ if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+ p = get_u32(p, &inode->i_rp_unknown_1);
+ p = get_u32(p, &inode->i_reparse_tag);
+ p = get_u16(p, &inode->i_rp_unknown_2);
+ p = get_u16(p, &inode->i_not_rpfixed);
} else {
- p = get_u32(p, &inode->reparse_tag);
- p = get_u64(p, &inode->ino);
+ p = get_u32(p, &inode->i_rp_unknown_1);
+ p = get_u64(p, &inode->i_ino);
}
/* By the way, the reparse_reserved field does not actually exist (at
* least when the file is not a reparse point) */
- p = get_u16(p, &inode->num_ads);
+ p = get_u16(p, &inode->i_num_ads);
- p = get_u16(p, &short_name_len);
- p = get_u16(p, &file_name_len);
+ p = get_u16(p, &short_name_nbytes);
+ p = get_u16(p, &file_name_nbytes);
/* We now know the length of the file name and short name. Make sure
* the length of the dentry is large enough to actually hold them.
* The calculated length here is unaligned to allow for the possibility
* that the dentry->length names an unaligned length, although this
* would be unexpected. */
- calculated_size = __dentry_correct_length_unaligned(file_name_len,
- short_name_len);
+ calculated_size = __dentry_correct_length_unaligned(file_name_nbytes,
+ short_name_nbytes);
if (dentry->length < calculated_size) {
ERROR("Unexpected end of directory entry! (Expected "
"at least %"PRIu64" bytes, got %"PRIu64" bytes. "
- "short_name_len = %hu, file_name_len = %hu)",
+ "short_name_nbytes = %hu, file_name_nbytes = %hu)",
calculated_size, dentry->length,
- short_name_len, file_name_len);
+ short_name_nbytes, file_name_nbytes);
ret = WIMLIB_ERR_INVALID_DENTRY;
goto out_free_inode;
}
/* Read the filename if present. Note: if the filename is empty, there
* is no null terminator following it. */
- if (file_name_len) {
- file_name = MALLOC(file_name_len);
+ if (file_name_nbytes) {
+ file_name = MALLOC(file_name_nbytes + 2);
if (!file_name) {
- ERROR("Failed to allocate %hu bytes for dentry file name",
- file_name_len);
+ ERROR("Failed to allocate %d bytes for dentry file name",
+ file_name_nbytes + 2);
ret = WIMLIB_ERR_NOMEM;
goto out_free_inode;
}
- p = get_bytes(p, file_name_len, file_name);
-
- /* Convert filename to UTF-8. */
- file_name_utf8 = utf16_to_utf8(file_name, file_name_len,
- &file_name_utf8_len);
-
- if (!file_name_utf8) {
- ERROR("Failed to allocate memory to convert UTF-16 "
- "filename (%hu bytes) to UTF-8", file_name_len);
- ret = WIMLIB_ERR_NOMEM;
- goto out_free_file_name;
+ p = get_bytes(p, file_name_nbytes + 2, file_name);
+ if (file_name[file_name_nbytes / 2] != 0) {
+ file_name[file_name_nbytes / 2] = 0;
+ WARNING("File name in WIM dentry \"%"WS"\" is not "
+ "null-terminated!", file_name);
}
- if (*(u16*)p)
- WARNING("Expected two zero bytes following the file name "
- "`%s', but found non-zero bytes", file_name_utf8);
- p += 2;
+ replace_forbidden_characters(file_name);
}
/* Align the calculated size */
* u64 reserved1; (always 0)
* u64 reserved2; (always 0)
* };*/
- DEBUG("Dentry for file or directory `%s' has %zu extra "
- "bytes of data",
- file_name_utf8, dentry->length - calculated_size);
+ /*DEBUG("Dentry for file or directory `%"WS"' has %"PRIu64" "*/
+ /*"extra bytes of data", file_name,*/
+ /*dentry->length - calculated_size);*/
}
/* Read the short filename if present. Note: if there is no short
* filename, there is no null terminator following it. */
- if (short_name_len) {
- short_name = MALLOC(short_name_len);
+ if (short_name_nbytes) {
+ short_name = MALLOC(short_name_nbytes + 2);
if (!short_name) {
- ERROR("Failed to allocate %hu bytes for short filename",
- short_name_len);
+ ERROR("Failed to allocate %d bytes for dentry short name",
+ short_name_nbytes + 2);
ret = WIMLIB_ERR_NOMEM;
- goto out_free_file_name_utf8;
+ goto out_free_file_name;
}
-
- p = get_bytes(p, short_name_len, short_name);
- if (*(u16*)p)
- WARNING("Expected two zero bytes following the short name of "
- "`%s', but found non-zero bytes", file_name_utf8);
- p += 2;
+ p = get_bytes(p, short_name_nbytes + 2, short_name);
+ if (short_name[short_name_nbytes / 2] != 0) {
+ short_name[short_name_nbytes / 2] = 0;
+ WARNING("Short name in WIM dentry \"%"WS"\" is not "
+ "null-terminated!", file_name);
+ }
+ replace_forbidden_characters(short_name);
}
/*
* aligned boundary, and the alternate data stream entries are NOT
* included in the dentry->length field for some reason.
*/
- if (inode->num_ads != 0) {
+ if (inode->i_num_ads != 0) {
/* Trying different lengths is just a hack to make sure we have
* a chance of reading the ADS entries correctly despite the
goto out;
}
ERROR("Failed to read alternate data stream "
- "entries of `%s'", dentry->file_name_utf8);
+ "entries of WIM dentry \"%"WS"\"", file_name);
goto out_free_short_name;
}
out:
-
/* We've read all the data for this dentry. Set the names and their
* lengths, and we've done. */
- dentry->d_inode = inode;
- dentry->file_name = file_name;
- dentry->file_name_utf8 = file_name_utf8;
- dentry->short_name = short_name;
- dentry->file_name_len = file_name_len;
- dentry->file_name_utf8_len = file_name_utf8_len;
- dentry->short_name_len = short_name_len;
+ dentry->d_inode = inode;
+ dentry->file_name = file_name;
+ dentry->short_name = short_name;
+ dentry->file_name_nbytes = file_name_nbytes;
+ dentry->short_name_nbytes = short_name_nbytes;
return 0;
out_free_short_name:
FREE(short_name);
-out_free_file_name_utf8:
- FREE(file_name_utf8);
out_free_file_name:
FREE(file_name);
out_free_inode:
* @metadata_resource_len: The length of the uncompressed metadata resource, in
* bytes.
*
- * @dentry: A pointer to a `struct dentry' that is the root of the directory
+ * @dentry: A pointer to a `struct wim_dentry' that is the root of the directory
* tree and has already been read from the metadata resource. It
* does not need to be the real root because this procedure is
* called recursively.
*
- * @return: Zero on success, nonzero on failure.
+ * Returns zero on success; nonzero on failure.
*/
-int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
- struct dentry *dentry)
+int
+read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
+ struct wim_dentry *dentry)
{
u64 cur_offset = dentry->subdir_offset;
- struct dentry *prev_child = NULL;
- struct dentry *first_child = NULL;
- struct dentry *child;
- struct dentry cur_child;
+ struct wim_dentry *child;
+ struct wim_dentry cur_child;
int ret;
/*
/* Not end of directory. Allocate this child permanently and
* link it to the parent and previous child. */
- child = MALLOC(sizeof(struct dentry));
+ child = MALLOC(sizeof(struct wim_dentry));
if (!child) {
ERROR("Failed to allocate %zu bytes for new dentry",
- sizeof(struct dentry));
+ sizeof(struct wim_dentry));
ret = WIMLIB_ERR_NOMEM;
break;
}
- memcpy(child, &cur_child, sizeof(struct dentry));
-
+ memcpy(child, &cur_child, sizeof(struct wim_dentry));
dentry_add_child(dentry, child);
-
inode_add_dentry(child, child->d_inode);
/* If there are children of this child, call this procedure
* @return: Pointer to the byte after the last byte we wrote as part of the
* dentry.
*/
-static u8 *write_dentry(const struct dentry *dentry, u8 *p)
+static u8 *
+write_dentry(const struct wim_dentry *dentry, u8 *p)
{
u8 *orig_p = p;
const u8 *hash;
- const struct inode *inode = dentry->d_inode;
+ const struct wim_inode *inode = dentry->d_inode;
/* We calculate the correct length of the dentry ourselves because the
* dentry->length field may been set to an unexpected value from when we
u64 length = dentry_correct_length(dentry);
p = put_u64(p, length);
- p = put_u32(p, inode->attributes);
- p = put_u32(p, inode->security_id);
+ p = put_u32(p, inode->i_attributes);
+ p = put_u32(p, inode->i_security_id);
p = put_u64(p, dentry->subdir_offset);
- p = put_u64(p, 0); /* unused1 */
- p = put_u64(p, 0); /* unused2 */
- p = put_u64(p, inode->creation_time);
- p = put_u64(p, inode->last_access_time);
- p = put_u64(p, inode->last_write_time);
+ p = put_u64(p, inode->i_unused_1);
+ p = put_u64(p, inode->i_unused_2);
+ p = put_u64(p, inode->i_creation_time);
+ p = put_u64(p, inode->i_last_access_time);
+ p = put_u64(p, inode->i_last_write_time);
hash = inode_stream_hash(inode, 0);
p = put_bytes(p, SHA1_HASH_SIZE, hash);
- if (inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
- p = put_zeroes(p, 4);
- p = put_u32(p, inode->reparse_tag);
- p = put_zeroes(p, 4);
+ if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+ p = put_u32(p, inode->i_rp_unknown_1);
+ p = put_u32(p, inode->i_reparse_tag);
+ p = put_u16(p, inode->i_rp_unknown_2);
+ p = put_u16(p, inode->i_not_rpfixed);
} else {
u64 link_group_id;
- p = put_u32(p, 0);
- if (inode->link_count == 1)
+ p = put_u32(p, inode->i_rp_unknown_1);
+ if (inode->i_nlink == 1)
link_group_id = 0;
else
- link_group_id = inode->ino;
+ link_group_id = inode->i_ino;
p = put_u64(p, link_group_id);
}
- p = put_u16(p, inode->num_ads);
- p = put_u16(p, dentry->short_name_len);
- p = put_u16(p, dentry->file_name_len);
- if (dentry->file_name_len) {
- p = put_bytes(p, dentry->file_name_len, (u8*)dentry->file_name);
- p = put_u16(p, 0); /* filename padding, 2 bytes. */
+ p = put_u16(p, inode->i_num_ads);
+ p = put_u16(p, dentry->short_name_nbytes);
+ p = put_u16(p, dentry->file_name_nbytes);
+ if (dentry_has_long_name(dentry)) {
+ p = put_bytes(p, dentry->file_name_nbytes + 2,
+ dentry->file_name);
}
- if (dentry->short_name) {
- p = put_bytes(p, dentry->short_name_len, (u8*)dentry->short_name);
- p = put_u16(p, 0); /* short name padding, 2 bytes */
+ if (dentry_has_short_name(dentry)) {
+ p = put_bytes(p, dentry->short_name_nbytes + 2,
+ dentry->short_name);
}
/* Align to 8-byte boundary */
/* Write the alternate data streams, if there are any. Please see
* read_ads_entries() for comments about the format of the on-disk
* alternate data stream entries. */
- for (u16 i = 0; i < inode->num_ads; i++) {
- p = put_u64(p, ads_entry_total_length(&inode->ads_entries[i]));
- p = put_u64(p, 0); /* Unused */
+ for (u16 i = 0; i < inode->i_num_ads; i++) {
+ p = put_u64(p, ads_entry_total_length(&inode->i_ads_entries[i]));
+ p = put_u64(p, inode->i_ads_entries[i].unused);
hash = inode_stream_hash(inode, i + 1);
p = put_bytes(p, SHA1_HASH_SIZE, hash);
- p = put_u16(p, inode->ads_entries[i].stream_name_len);
- if (inode->ads_entries[i].stream_name_len) {
- p = put_bytes(p, inode->ads_entries[i].stream_name_len,
- (u8*)inode->ads_entries[i].stream_name);
- p = put_u16(p, 0);
+ p = put_u16(p, inode->i_ads_entries[i].stream_name_nbytes);
+ if (inode->i_ads_entries[i].stream_name_nbytes) {
+ p = put_bytes(p,
+ inode->i_ads_entries[i].stream_name_nbytes + 2,
+ inode->i_ads_entries[i].stream_name);
}
p = put_zeroes(p, (8 - (p - orig_p) % 8) % 8);
}
return p;
}
-static int write_dentry_cb(struct dentry *dentry, void *_p)
+static int
+write_dentry_cb(struct wim_dentry *dentry, void *_p)
{
u8 **p = _p;
*p = write_dentry(dentry, *p);
return 0;
}
-static u8 *write_dentry_tree_recursive(const struct dentry *parent, u8 *p);
+static u8 *
+write_dentry_tree_recursive(const struct wim_dentry *parent, u8 *p);
-static int write_dentry_tree_recursive_cb(struct dentry *dentry, void *_p)
+static int
+write_dentry_tree_recursive_cb(struct wim_dentry *dentry, void *_p)
{
u8 **p = _p;
*p = write_dentry_tree_recursive(dentry, *p);
/* Recursive function that writes a dentry tree rooted at @parent, not including
* @parent itself, which has already been written. */
-static u8 *write_dentry_tree_recursive(const struct dentry *parent, u8 *p)
+static u8 *
+write_dentry_tree_recursive(const struct wim_dentry *parent, u8 *p)
{
/* Nothing to do if this dentry has no children. */
if (parent->subdir_offset == 0)
* recursively writing the directory trees rooted at each of the child
* dentries, since the on-disk dentries for a dentry's children are
* always located at consecutive positions in the metadata resource! */
- for_dentry_in_rbtree(parent->d_inode->children.rb_node, write_dentry_cb, &p);
+ for_dentry_child(parent, write_dentry_cb, &p);
/* write end of directory entry */
p = put_u64(p, 0);
/* Recurse on children. */
- for_dentry_in_rbtree(parent->d_inode->children.rb_node,
- write_dentry_tree_recursive_cb, &p);
+ for_dentry_child(parent, write_dentry_tree_recursive_cb, &p);
return p;
}
*
* Returns pointer to the byte after the last byte we wrote.
*/
-u8 *write_dentry_tree(const struct dentry *root, u8 *p)
+u8 *
+write_dentry_tree(const struct wim_dentry *root, u8 *p)
{
DEBUG("Writing dentry tree.");
wimlib_assert(dentry_is_root(root));
/* Recursively write the rest of the dentry tree. */
return write_dentry_tree_recursive(root, p);
}
-