X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-capture.c;h=da7944809c9c1817575634491e8881cb4a16d08c;hp=0abbebac94608ab53bc4a2b5808b419f289030be;hb=541b65d79e0c73238a25e2c2661711d8593d0684;hpb=ded522fd0a15d740354329c5066ebd3473563e57 diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index 0abbebac..da794480 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -30,160 +30,30 @@ #include #include -#include "wimlib_internal.h" - - +#include "buffer_io.h" #include "dentry.h" #include "lookup_table.h" -#include "buffer_io.h" +#include "security.h" +#include "wimlib_internal.h" + #include #include #include #include #include -#include /* security.h before xattrs.h */ +#include /* ntfs-3g/security.h before ntfs-3g/xattrs.h */ #include #include #include #include #include -/* Structure that allows searching the security descriptors by SHA1 message - * digest. */ -struct sd_set { - struct wim_security_data *sd; - struct sd_node *root; -}; - -/* Binary tree node of security descriptors, indexed by the @hash field. */ -struct sd_node { - int security_id; - u8 hash[SHA1_HASH_SIZE]; - struct sd_node *left; - struct sd_node *right; -}; - -static void free_sd_tree(struct sd_node *root) -{ - if (root) { - free_sd_tree(root->left); - free_sd_tree(root->right); - FREE(root); - } -} -/* Frees a security descriptor index set. */ -static void destroy_sd_set(struct sd_set *sd_set) -{ - free_sd_tree(sd_set->root); -} - -/* Inserts a a new node into the security descriptor index tree. */ -static void insert_sd_node(struct sd_node *new, struct sd_node *root) -{ - int cmp = hashes_cmp(new->hash, root->hash); - if (cmp < 0) { - if (root->left) - insert_sd_node(new, root->left); - else - root->left = new; - } else if (cmp > 0) { - if (root->right) - insert_sd_node(new, root->right); - else - root->right = new; - } else { - wimlib_assert(0); - } -} - -/* Returns the security ID of the security data having a SHA1 message digest of - * @hash in the security descriptor index tree rooted at @root. - * - * If not found, return -1. */ -static int lookup_sd(const u8 hash[SHA1_HASH_SIZE], struct sd_node *root) -{ - int cmp; - if (!root) - return -1; - cmp = hashes_cmp(hash, root->hash); - if (cmp < 0) - return lookup_sd(hash, root->left); - else if (cmp > 0) - return lookup_sd(hash, root->right); - else - return root->security_id; -} - -/* - * Adds a security descriptor to the indexed security descriptor set as well as - * the corresponding `struct wim_security_data', and returns the new security - * ID; or, if there is an existing security descriptor that is the same, return - * the security ID for it. If a new security descriptor cannot be allocated, - * return -1. - */ -static int sd_set_add_sd(struct sd_set *sd_set, const char descriptor[], - size_t size) -{ - u8 hash[SHA1_HASH_SIZE]; - int security_id; - struct sd_node *new; - u8 **descriptors; - u64 *sizes; - u8 *descr_copy; - struct wim_security_data *sd; - - sha1_buffer((const u8*)descriptor, size, hash); - - security_id = lookup_sd(hash, sd_set->root); - if (security_id >= 0) - return security_id; - - new = MALLOC(sizeof(*new)); - if (!new) - goto out; - descr_copy = MALLOC(size); - if (!descr_copy) - goto out_free_node; - - sd = sd_set->sd; - - memcpy(descr_copy, descriptor, size); - new->security_id = sd->num_entries; - new->left = NULL; - new->right = NULL; - copy_hash(new->hash, hash); - - - descriptors = REALLOC(sd->descriptors, - (sd->num_entries + 1) * sizeof(sd->descriptors[0])); - if (!descriptors) - goto out_free_descr; - sd->descriptors = descriptors; - sizes = REALLOC(sd->sizes, - (sd->num_entries + 1) * sizeof(sd->sizes[0])); - if (!sizes) - goto out_free_descr; - sd->sizes = sizes; - sd->descriptors[sd->num_entries] = descr_copy; - sd->sizes[sd->num_entries] = size; - sd->num_entries++; - DEBUG("There are now %d security descriptors", sd->num_entries); - sd->total_length += size + sizeof(sd->sizes[0]); - - if (sd_set->root) - insert_sd_node(new, sd_set->root); - else - sd_set->root = new; - return new->security_id; -out_free_descr: - FREE(descr_copy); -out_free_node: - FREE(new); -out: - return -1; -} +#ifdef HAVE_ALLOCA_H +#include +#endif -static inline ntfschar *attr_record_name(ATTR_RECORD *ar) +static inline ntfschar * +attr_record_name(ATTR_RECORD *ar) { return (ntfschar*)((u8*)ar + le16_to_cpu(ar->name_offset)); } @@ -199,10 +69,11 @@ static inline ntfschar *attr_record_name(ATTR_RECORD *ar) * * Return 0 on success or nonzero on error. */ -static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, - u8 md[SHA1_HASH_SIZE], - bool is_reparse_point, - u32 *reparse_tag_ret) +static int +ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, + u8 md[SHA1_HASH_SIZE], + bool is_reparse_point, + u32 *reparse_tag_ret) { s64 pos = 0; s64 bytes_remaining; @@ -223,6 +94,7 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, if (ntfs_attr_pread(na, 0, 8, buf) != 8) goto out_error; *reparse_tag_ret = le32_to_cpu(*(u32*)buf); + DEBUG("ReparseTag = %#x", *reparse_tag_ret); pos = 8; bytes_remaining -= 8; } @@ -246,17 +118,20 @@ out_error: /* Load the streams from a file or reparse point in the NTFS volume into the WIM * lookup table */ -static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, - char path[], size_t path_len, - struct lookup_table *lookup_table, - ntfs_volume **ntfs_vol_p, - ATTR_TYPES type) +static int +capture_ntfs_streams(struct wim_dentry *dentry, + ntfs_inode *ni, + mbchar *path, + size_t path_len, + struct wim_lookup_table *lookup_table, + ntfs_volume **ntfs_vol_p, + ATTR_TYPES type) { ntfs_attr_search_ctx *actx; u8 attr_hash[SHA1_HASH_SIZE]; struct ntfs_location *ntfs_loc = NULL; int ret = 0; - struct lookup_table_entry *lte; + struct wim_lookup_table_entry *lte; DEBUG2("Capturing NTFS data streams from `%s'", path); @@ -272,11 +147,9 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, while (!ntfs_attr_lookup(type, NULL, 0, CASE_SENSITIVE, 0, NULL, 0, actx)) { - char *stream_name_utf8; u32 reparse_tag; u64 data_size = ntfs_get_attribute_value_length(actx->attr); u64 name_length = actx->attr->name_length; - if (data_size == 0) { if (errno != 0) { ERROR_WITH_ERRNO("Failed to get size of attribute of " @@ -299,6 +172,9 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, if (ret != 0) goto out_put_actx; + if (type == AT_REPARSE_POINT) + dentry->d_inode->i_reparse_tag = reparse_tag; + /* Make a lookup table entry for the stream, or use an existing * one if there's already an identical stream. */ lte = __lookup_resource(lookup_table, attr_hash); @@ -310,18 +186,18 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, if (!ntfs_loc) goto out_put_actx; ntfs_loc->ntfs_vol_p = ntfs_vol_p; - ntfs_loc->path_utf8 = MALLOC(path_len + 1); - if (!ntfs_loc->path_utf8) + ntfs_loc->path = MALLOC(path_len + 1); + if (!ntfs_loc->path) goto out_free_ntfs_loc; - memcpy(ntfs_loc->path_utf8, path, path_len + 1); + memcpy(ntfs_loc->path, path, path_len + 1); if (name_length) { - ntfs_loc->stream_name_utf16 = MALLOC(name_length * 2); - if (!ntfs_loc->stream_name_utf16) + ntfs_loc->stream_name = MALLOC(name_length * 2); + if (!ntfs_loc->stream_name) goto out_free_ntfs_loc; - memcpy(ntfs_loc->stream_name_utf16, + memcpy(ntfs_loc->stream_name, attr_record_name(actx->attr), actx->attr->name_length * 2); - ntfs_loc->stream_name_utf16_num_chars = name_length; + ntfs_loc->stream_name_nchars = name_length; } lte = new_lookup_table_entry(); @@ -330,7 +206,6 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, lte->ntfs_loc = ntfs_loc; lte->resource_location = RESOURCE_IN_NTFS_VOLUME; if (type == AT_REPARSE_POINT) { - dentry->d_inode->reparse_tag = reparse_tag; ntfs_loc->is_reparse_point = true; lte->resource_entry.original_size = data_size - 8; lte->resource_entry.size = data_size - 8; @@ -340,9 +215,6 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, lte->resource_entry.size = data_size; } ntfs_loc = NULL; - DEBUG("Add resource for `%s' (size = %zu)", - dentry->file_name_utf8, - lte->resource_entry.original_size); copy_hash(lte->hash, attr_hash); lookup_table_insert(lookup_table, lte); } @@ -350,32 +222,24 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, if (name_length == 0) { /* Unnamed data stream. Put the reference to it in the * dentry's inode. */ - if (dentry->d_inode->lte) { - ERROR("Found two un-named data streams for " - "`%s'", path); - ret = WIMLIB_ERR_NTFS_3G; - goto out_free_lte; + if (dentry->d_inode->i_lte) { + WARNING("Found two un-named data streams for " + "`%s'", path); + free_lookup_table_entry(lte); + } else { + dentry->d_inode->i_lte = lte; } - dentry->d_inode->lte = lte; } else { /* Named data stream. Put the reference to it in the * alternate data stream entries */ - struct ads_entry *new_ads_entry; - size_t stream_name_utf8_len; + struct wim_ads_entry *new_ads_entry; - ret = utf16_to_utf8((const char*)attr_record_name(actx->attr), - name_length * 2, - &stream_name_utf8, - &stream_name_utf8_len); - if (ret != 0) - goto out_free_lte; - new_ads_entry = inode_add_ads(dentry->d_inode, stream_name_utf8); - FREE(stream_name_utf8); + new_ads_entry = inode_add_ads_utf16le(dentry->d_inode, + attr_record_name(actx->attr), + name_length * 2); if (!new_ads_entry) goto out_free_lte; - - wimlib_assert(new_ads_entry->stream_name_len == name_length * 2); - + wimlib_assert(new_ads_entry->stream_name_nbytes == name_length * 2); new_ads_entry->lte = lte; } } @@ -385,8 +249,8 @@ out_free_lte: free_lookup_table_entry(lte); out_free_ntfs_loc: if (ntfs_loc) { - FREE(ntfs_loc->path_utf8); - FREE(ntfs_loc->stream_name_utf16); + FREE(ntfs_loc->path); + FREE(ntfs_loc->stream_name); FREE(ntfs_loc); } out_put_actx: @@ -398,126 +262,255 @@ out_put_actx: return ret; } +/* Red-black tree that maps NTFS inode numbers to DOS names */ +struct dos_name_map { + struct rb_root rb_root; +}; + +struct dos_name_node { + struct rb_node rb_node; + char dos_name[24]; + int name_nbytes; + u64 ntfs_ino; +}; + +/* Inserts a new DOS name into the map */ +static int +insert_dos_name(struct dos_name_map *map, const ntfschar *dos_name, + size_t name_nbytes, u64 ntfs_ino) +{ + struct dos_name_node *new_node; + struct rb_node **p; + struct rb_root *root; + struct rb_node *rb_parent; + + DEBUG("DOS name_len = %zu", name_nbytes); + new_node = MALLOC(sizeof(struct dos_name_node)); + if (!new_node) + return -1; + + /* DOS names are supposed to be 12 characters max (that's 24 bytes, + * assuming 2-byte ntfs characters) */ + wimlib_assert(name_nbytes <= sizeof(new_node->dos_name)); + + /* Initialize the DOS name, DOS name length, and NTFS inode number of + * the red-black tree node */ + memcpy(new_node->dos_name, dos_name, name_nbytes); + new_node->name_nbytes = name_nbytes; + new_node->ntfs_ino = ntfs_ino; + + /* Insert the red-black tree node */ + root = &map->rb_root; + p = &root->rb_node; + rb_parent = NULL; + while (*p) { + struct dos_name_node *this; + + this = container_of(*p, struct dos_name_node, rb_node); + rb_parent = *p; + if (new_node->ntfs_ino < this->ntfs_ino) + p = &((*p)->rb_left); + else if (new_node->ntfs_ino > this->ntfs_ino) + p = &((*p)->rb_right); + else { + /* This should be impossible since a NTFS inode cannot + * have multiple DOS names, and we only should get each + * DOS name entry once from the ntfs_readdir() calls. */ + ERROR("NTFS inode %"PRIu64" has multiple DOS names", + ntfs_ino); + return -1; + } + } + rb_link_node(&new_node->rb_node, rb_parent, p); + rb_insert_color(&new_node->rb_node, root); + DEBUG("Inserted DOS name for inode %"PRIu64, ntfs_ino); + return 0; +} + +/* Returns a structure that contains the DOS name and its length for a NTFS + * inode, or NULL if the inode has no DOS name. */ +static struct dos_name_node * +lookup_dos_name(const struct dos_name_map *map, u64 ntfs_ino) +{ + struct rb_node *node = map->rb_root.rb_node; + while (node) { + struct dos_name_node *this; + this = container_of(node, struct dos_name_node, rb_node); + if (ntfs_ino < this->ntfs_ino) + node = node->rb_left; + else if (ntfs_ino > this->ntfs_ino) + node = node->rb_right; + else + return this; + } + return NULL; +} + +static int +set_dentry_dos_name(struct wim_dentry *dentry, void *arg) +{ + const struct dos_name_map *map = arg; + const struct dos_name_node *node; + + if (dentry->is_win32_name) { + node = lookup_dos_name(map, dentry->d_inode->i_ino); + if (node) { + dentry->short_name = MALLOC(node->name_nbytes + 2); + if (!dentry->short_name) + return WIMLIB_ERR_NOMEM; + memcpy(dentry->short_name, node->dos_name, + node->name_nbytes); + dentry->short_name[node->name_nbytes / 2] = 0; + dentry->short_name_nbytes = node->name_nbytes; + DEBUG("Assigned DOS name to ino %"PRIu64, + dentry->d_inode->i_ino); + } else { + WARNING("NTFS inode %"PRIu64" has Win32 name with no " + "corresponding DOS name", + dentry->d_inode->i_ino); + } + } + return 0; +} + +static void +free_dos_name_tree(struct rb_node *node) { + if (node) { + free_dos_name_tree(node->rb_left); + free_dos_name_tree(node->rb_right); + FREE(container_of(node, struct dos_name_node, rb_node)); + } +} + +static void +destroy_dos_name_map(struct dos_name_map *map) +{ + free_dos_name_tree(map->rb_root.rb_node); +} + struct readdir_ctx { - struct dentry *parent; - ntfs_inode *dir_ni; - char *path; - size_t path_len; - struct lookup_table *lookup_table; - struct sd_set *sd_set; + struct wim_dentry *parent; + ntfs_inode *dir_ni; + mbchar *path; + size_t path_len; + struct wim_lookup_table *lookup_table; + struct sd_set *sd_set; + struct dos_name_map *dos_name_map; const struct capture_config *config; - ntfs_volume **ntfs_vol_p; - int add_image_flags; + ntfs_volume **ntfs_vol_p; + int add_image_flags; wimlib_progress_func_t progress_func; }; static int -build_dentry_tree_ntfs_recursive(struct dentry **root_p, ntfs_inode *dir_ni, - ntfs_inode *ni, char path[], size_t path_len, +build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, + ntfs_inode *dir_ni, + ntfs_inode *ni, + mbchar *path, + size_t path_len, int name_type, - struct lookup_table *lookup_table, + struct wim_lookup_table *lookup_table, struct sd_set *sd_set, const struct capture_config *config, ntfs_volume **ntfs_vol_p, int add_image_flags, wimlib_progress_func_t progress_func); -static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, - const int name_len, const int name_type, - const s64 pos, const MFT_REF mref, - const unsigned dt_type) +static int +wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, + const int name_nchars, const int name_type, + const s64 pos, const MFT_REF mref, + const unsigned dt_type) { struct readdir_ctx *ctx; - size_t utf8_name_len; - char *utf8_name; - struct dentry *child = NULL; + size_t mbs_name_nbytes; + mbchar *mbs_name; + struct wim_dentry *child; int ret; size_t path_len; + size_t name_nbytes = name_nchars * sizeof(ntfschar); - if (name_type == FILE_NAME_DOS) - return 0; - - ret = utf16_to_utf8((const char*)name, name_len * 2, - &utf8_name, &utf8_name_len); - if (ret != 0) - return -1; + ctx = dirent; + if (name_type & FILE_NAME_DOS) { + /* If this is the entry for a DOS name, store it for later. */ + ret = insert_dos_name(ctx->dos_name_map, name, + name_nbytes, mref & MFT_REF_MASK_CPU); + + /* Return now if an error occurred or if this is just a DOS name + * and not a Win32+DOS name. */ + if (ret != 0 || name_type == FILE_NAME_DOS) + goto out; + } + ret = utf16le_to_mbs(name, name_nbytes, + &mbs_name, &mbs_name_nbytes); + if (ret) + goto out; - if (utf8_name[0] == '.' && - (utf8_name[1] == '\0' || - (utf8_name[1] == '.' && utf8_name[2] == '\0'))) { + if (mbs_name[0] == '.' && + (mbs_name[1] == '\0' || + (mbs_name[1] == '.' && mbs_name[2] == '\0'))) { + /* . or .. entries + * + * note: name_type is POSIX for these, so DOS names will not + * have been inserted for them. */ ret = 0; - goto out_free_utf8_name; + goto out_free_mbs_name; } - ctx = dirent; - + /* Open the inode for this directory entry and recursively capture the + * directory tree rooted at it */ ntfs_inode *ni = ntfs_inode_open(ctx->dir_ni->vol, mref); if (!ni) { ERROR_WITH_ERRNO("Failed to open NTFS inode"); - goto out_free_utf8_name; + ret = -1; + goto out_free_mbs_name; } path_len = ctx->path_len; if (path_len != 1) ctx->path[path_len++] = '/'; - memcpy(ctx->path + path_len, utf8_name, utf8_name_len + 1); - path_len += utf8_name_len; + memcpy(ctx->path + path_len, mbs_name, mbs_name_nbytes + 1); + path_len += mbs_name_nbytes; + child = NULL; ret = build_dentry_tree_ntfs_recursive(&child, ctx->dir_ni, ni, ctx->path, path_len, name_type, ctx->lookup_table, ctx->sd_set, ctx->config, ctx->ntfs_vol_p, ctx->add_image_flags, ctx->progress_func); - if (child) dentry_add_child(ctx->parent, child); - ntfs_inode_close(ni); -out_free_utf8_name: - FREE(utf8_name); +out_free_mbs_name: + FREE(mbs_name); out: return ret; } -static int change_dentry_short_name(struct dentry *dentry, - const char short_name_utf8[], - int short_name_utf8_len) -{ - size_t short_name_utf16_len; - char *short_name_utf16; - int ret; - - ret = utf8_to_utf16(short_name_utf8, short_name_utf8_len, - &short_name_utf16, &short_name_utf16_len); - if (ret == 0) { - dentry->short_name = short_name_utf16; - dentry->short_name_len = short_name_utf16_len; - } - return ret; -} - /* Recursively build a WIM dentry tree corresponding to a NTFS volume. * At the same time, update the WIM lookup table with lookup table entries for * the NTFS streams, and build an array of security descriptors. */ -static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, - ntfs_inode *dir_ni, - ntfs_inode *ni, - char path[], - size_t path_len, - int name_type, - struct lookup_table *lookup_table, - struct sd_set *sd_set, - const struct capture_config *config, - ntfs_volume **ntfs_vol_p, - int add_image_flags, - wimlib_progress_func_t progress_func) +static int +build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, + ntfs_inode *dir_ni, + ntfs_inode *ni, + mbchar *path, + size_t path_len, + int name_type, + struct wim_lookup_table *lookup_table, + struct sd_set *sd_set, + const struct capture_config *config, + ntfs_volume **ntfs_vol_p, + int add_image_flags, + wimlib_progress_func_t progress_func) { u32 attributes; - int mrec_flags; int ret; - struct dentry *root; + struct wim_dentry *root; if (exclude_path(path, config, false)) { + /* Exclude a file or directory tree based on the capture + * configuration file */ if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) && progress_func) { @@ -530,7 +523,7 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, return 0; } - mrec_flags = ni->mrec->flags; + /* Get file attributes */ struct SECURITY_CONTEXT ctx; memset(&ctx, 0, sizeof(ctx)); ctx.vol = ni->vol; @@ -552,71 +545,54 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } - root = new_dentry_with_timeless_inode(path_basename(path)); - if (!root) { - if (errno == EILSEQ) - return WIMLIB_ERR_INVALID_UTF8_STRING; - else - return WIMLIB_ERR_NOMEM; - } - *root_p = root; + /* Create the new WIM dentry */ + ret = new_dentry_with_timeless_inode(path_basename(path), &root); + if (ret) + return ret; - if (dir_ni && (name_type == FILE_NAME_WIN32_AND_DOS - || name_type == FILE_NAME_WIN32)) - { - char dos_name_utf8[12 * 4 + 1] = {0}; - ret = ntfs_get_ntfs_dos_name(ni, dir_ni, dos_name_utf8, - sizeof(dos_name_utf8) - 1); - if (ret > 0) { - DEBUG("Changing short name of `%s'", path); - ret = change_dentry_short_name(root, dos_name_utf8, - ret); - if (ret != 0) - return ret; - } else { - #ifdef ENODATA - if (errno != ENODATA) { - ERROR_WITH_ERRNO("Error getting DOS name " - "of `%s'", path); - return WIMLIB_ERR_NTFS_3G; - } - #endif - } - } + *root_p = root; - root->d_inode->creation_time = le64_to_cpu(ni->creation_time); - root->d_inode->last_write_time = le64_to_cpu(ni->last_data_change_time); - root->d_inode->last_access_time = le64_to_cpu(ni->last_access_time); - root->d_inode->attributes = le32_to_cpu(attributes); - root->d_inode->ino = ni->mft_no; - root->d_inode->resolved = true; + if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name */ + root->is_win32_name = 1; + root->d_inode->i_creation_time = le64_to_cpu(ni->creation_time); + root->d_inode->i_last_write_time = le64_to_cpu(ni->last_data_change_time); + root->d_inode->i_last_access_time = le64_to_cpu(ni->last_access_time); + root->d_inode->i_attributes = le32_to_cpu(attributes); + root->d_inode->i_ino = ni->mft_no; + root->d_inode->i_resolved = 1; if (attributes & FILE_ATTR_REPARSE_POINT) { /* Junction point, symbolic link, or other reparse point */ ret = capture_ntfs_streams(root, ni, path, path_len, lookup_table, ntfs_vol_p, AT_REPARSE_POINT); - } else if (mrec_flags & MFT_RECORD_IS_DIRECTORY) { + } else if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) { /* Normal directory */ s64 pos = 0; + struct dos_name_map dos_name_map = { .rb_root = {.rb_node = NULL} }; struct readdir_ctx ctx = { - .parent = root, - .dir_ni = ni, - .path = path, - .path_len = path_len, - .lookup_table = lookup_table, - .sd_set = sd_set, - .config = config, - .ntfs_vol_p = ntfs_vol_p, + .parent = root, + .dir_ni = ni, + .path = path, + .path_len = path_len, + .lookup_table = lookup_table, + .sd_set = sd_set, + .dos_name_map = &dos_name_map, + .config = config, + .ntfs_vol_p = ntfs_vol_p, .add_image_flags = add_image_flags, - .progress_func = progress_func, + .progress_func = progress_func, }; ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir); - if (ret != 0) { + if (ret) { ERROR_WITH_ERRNO("ntfs_readdir()"); ret = WIMLIB_ERR_NTFS_3G; + } else { + ret = for_dentry_child(root, set_dentry_dos_name, + &dos_name_map); } + destroy_dos_name_map(&dos_name_map); } else { /* Normal file */ ret = capture_ntfs_streams(root, ni, path, path_len, @@ -626,6 +602,7 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, if (ret != 0) return ret; + /* Get security descriptor */ char _sd[1]; char *sd = _sd; errno = 0; @@ -638,46 +615,53 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, ni, dir_ni, sd, ret); } if (ret > 0) { - root->d_inode->security_id = sd_set_add_sd(sd_set, sd, ret); - if (root->d_inode->security_id == -1) { + root->d_inode->i_security_id = sd_set_add_sd(sd_set, sd, ret); + if (root->d_inode->i_security_id == -1) { ERROR("Out of memory"); return WIMLIB_ERR_NOMEM; } DEBUG("Added security ID = %u for `%s'", - root->d_inode->security_id, path); + root->d_inode->i_security_id, path); ret = 0; } else if (ret < 0) { ERROR_WITH_ERRNO("Failed to get security information from " "`%s'", path); ret = WIMLIB_ERR_NTFS_3G; } else { - root->d_inode->security_id = -1; + root->d_inode->i_security_id = -1; DEBUG("No security ID for `%s'", path); } return ret; } -int build_dentry_tree_ntfs(struct dentry **root_p, - const char *device, - struct lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg) +int +build_dentry_tree_ntfs(struct wim_dentry **root_p, + const mbchar *device, + struct wim_lookup_table *lookup_table, + struct wim_security_data *sd, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg) { ntfs_volume *vol; ntfs_inode *root_ni; - int ret = 0; + int ret; struct sd_set sd_set = { .sd = sd, - .root = NULL, + .rb_root = {NULL}, }; ntfs_volume **ntfs_vol_p = extra_arg; DEBUG("Mounting NTFS volume `%s' read-only", device); +#ifdef HAVE_NTFS_MNT_RDONLY + /* NTFS-3g 2013 */ + vol = ntfs_mount(device, NTFS_MNT_RDONLY); +#else + /* NTFS-3g 2011, 2012 */ vol = ntfs_mount(device, MS_RDONLY); +#endif if (!vol) { ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s' read-only", device); @@ -699,11 +683,12 @@ int build_dentry_tree_ntfs(struct dentry **root_p, goto out; } - /* Currently we assume that all the UTF-8 paths fit into this length and - * there is no check for overflow. */ - char *path = MALLOC(32768); + /* Currently we assume that all the paths fit into this length and there + * is no check for overflow. */ + mbchar *path = MALLOC(32768); if (!path) { ERROR("Could not allocate memory for NTFS pathname"); + ret = WIMLIB_ERR_NOMEM; goto out_cleanup; } @@ -711,15 +696,19 @@ int build_dentry_tree_ntfs(struct dentry **root_p, path[1] = '\0'; ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1, FILE_NAME_POSIX, lookup_table, - &sd_set, config, ntfs_vol_p, + &sd_set, + config, ntfs_vol_p, add_image_flags, progress_func); out_cleanup: FREE(path); ntfs_inode_close(root_ni); destroy_sd_set(&sd_set); - out: + ntfs_index_ctx_put(vol->secure_xsii); + ntfs_index_ctx_put(vol->secure_xsdh); + ntfs_inode_close(vol->secure_ni); + if (ret) { if (ntfs_umount(vol, FALSE) != 0) { ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'",