X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-capture.c;h=a257cdb69d600041e155b432afb3260d8a048db0;hp=2c478b104bef1be1960216e4cb059f3e0e437ed7;hb=9825ced3bc0b131ded093cbe192ec367496d034d;hpb=cbda4ad178585ce34762b0da0f488efddd8cf8ae diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index 2c478b10..a257cdb6 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -24,14 +24,18 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ + #include "config.h" + +#include +#include + #include "wimlib_internal.h" -#ifdef WITH_NTFS_3G #include "dentry.h" #include "lookup_table.h" -#include "io.h" +#include "buffer_io.h" #include #include #include @@ -43,78 +47,76 @@ #include #include #include - -#if 0 -extern int ntfs_get_inode_security(ntfs_inode *ni, u32 selection, char *buf, - u32 buflen, u32 *psize); - -extern u32 ntfs_get_inode_attributes(ntfs_inode *ni); -#endif +#include "rbtree.h" /* Structure that allows searching the security descriptors by SHA1 message * digest. */ struct sd_set { struct wim_security_data *sd; - struct sd_node *root; + struct rb_root rb_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; + struct rb_node rb_node; }; -static void free_sd_tree(struct sd_node *root) +static void free_sd_tree(struct rb_node *node) { - if (root) { - free_sd_tree(root->left); - free_sd_tree(root->right); - FREE(root); + if (node) { + free_sd_tree(node->rb_left); + free_sd_tree(node->rb_right); + FREE(container_of(node, struct sd_node, rb_node)); } } /* Frees a security descriptor index set. */ static void destroy_sd_set(struct sd_set *sd_set) { - free_sd_tree(sd_set->root); + free_sd_tree(sd_set->rb_root.rb_node); } /* Inserts a a new node into the security descriptor index tree. */ -static void insert_sd_node(struct sd_node *new, struct sd_node *root) +static void insert_sd_node(struct sd_set *set, struct sd_node *new) { - 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); + struct rb_root *root = &set->rb_root; + struct rb_node **p = &(root->rb_node); + struct rb_node *rb_parent = NULL; + + while (*p) { + struct sd_node *this = container_of(*p, struct sd_node, rb_node); + int cmp = hashes_cmp(new->hash, this->hash); + + rb_parent = *p; + if (cmp < 0) + p = &((*p)->rb_left); + else if (cmp > 0) + p = &((*p)->rb_right); + else + wimlib_assert(0); /* Duplicate SHA1 message digest */ } + rb_link_node(&new->rb_node, rb_parent, p); + rb_insert_color(&new->rb_node, root); } -/* 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) +/* Returns the index of the security descriptor having a SHA1 message digest of + * @hash. If not found, return -1. */ +static int lookup_sd(struct sd_set *set, const u8 hash[SHA1_HASH_SIZE]) { - 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; + struct rb_node *node = set->rb_root.rb_node; + + while (node) { + struct sd_node *sd_node = container_of(node, struct sd_node, rb_node); + int cmp = hashes_cmp(hash, sd_node->hash); + if (cmp < 0) + node = node->rb_left; + else if (cmp > 0) + node = node->rb_right; + else + return sd_node->security_id; + } + return -1; } /* @@ -137,10 +139,11 @@ static int sd_set_add_sd(struct sd_set *sd_set, const char descriptor[], sha1_buffer((const u8*)descriptor, size, hash); - security_id = lookup_sd(hash, sd_set->root); - if (security_id >= 0) + security_id = lookup_sd(sd_set, hash); + if (security_id >= 0) /* Identical descriptor already exists */ return security_id; + /* Need to add a new security descriptor */ new = MALLOC(sizeof(*new)); if (!new) goto out; @@ -152,11 +155,8 @@ static int sd_set_add_sd(struct sd_set *sd_set, const char descriptor[], 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) @@ -172,11 +172,7 @@ static int sd_set_add_sd(struct sd_set *sd_set, const char descriptor[], 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; + insert_sd_node(sd_set, new); return new->security_id; out_free_descr: FREE(descr_copy); @@ -191,7 +187,7 @@ static inline ntfschar *attr_record_name(ATTR_RECORD *ar) return (ntfschar*)((u8*)ar + le16_to_cpu(ar->name_offset)); } -/* Calculates the SHA1 message digest of a NTFS attribute. +/* Calculates the SHA1 message digest of a NTFS attribute. * * @ni: The NTFS inode containing the attribute. * @ar: The ATTR_RECORD describing the attribute. @@ -204,11 +200,12 @@ static inline ntfschar *attr_record_name(ATTR_RECORD *ar) */ 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; - char buf[4096]; + char buf[BUFFER_SIZE]; ntfs_attr *na; SHA_CTX ctx; @@ -220,19 +217,20 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, } bytes_remaining = na->data_size; - sha1_init(&ctx); - DEBUG2("Calculating SHA1 message digest (%"PRIu64" bytes)", - bytes_remaining); + if (is_reparse_point) { + if (ntfs_attr_pread(na, 0, 8, buf) != 8) + goto out_error; + *reparse_tag_ret = le32_to_cpu(*(u32*)buf); + pos = 8; + bytes_remaining -= 8; + } + sha1_init(&ctx); while (bytes_remaining) { s64 to_read = min(bytes_remaining, sizeof(buf)); - if (ntfs_attr_pread(na, pos, to_read, buf) != to_read) { - ERROR_WITH_ERRNO("Error reading NTFS attribute"); - return WIMLIB_ERR_NTFS_3G; - } - if (bytes_remaining == na->data_size && reparse_tag_ret) - *reparse_tag_ret = le32_to_cpu(*(u32*)buf); + if (ntfs_attr_pread(na, pos, to_read, buf) != to_read) + goto out_error; sha1_update(&ctx, buf, to_read); pos += to_read; bytes_remaining -= to_read; @@ -240,22 +238,24 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, sha1_final(md, &ctx); ntfs_attr_close(na); return 0; +out_error: + ERROR_WITH_ERRNO("Error reading NTFS attribute"); + return WIMLIB_ERR_NTFS_3G; } -/* Load the streams from a WIM file or reparse point in the NTFS volume into the - * WIM lookup table */ -static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, +/* Load the streams from a file or reparse point in the NTFS volume into the WIM + * lookup table */ +static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni, char path[], size_t path_len, - struct lookup_table *lookup_table, + 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,12 +272,11 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, CASE_SENSITIVE, 0, NULL, 0, actx)) { char *stream_name_utf8; - size_t stream_name_utf16_len; 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 (data_size == 0) { if (errno != 0) { ERROR_WITH_ERRNO("Failed to get size of attribute of " "`%s'", path); @@ -294,7 +293,8 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, goto out_put_actx; } /* Checksum the stream. */ - ret = ntfs_attr_sha1sum(ni, actx->attr, attr_hash, &reparse_tag); + ret = ntfs_attr_sha1sum(ni, actx->attr, attr_hash, + type == AT_REPARSE_POINT, &reparse_tag); if (ret != 0) goto out_put_actx; @@ -329,7 +329,7 @@ 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->reparse_tag = reparse_tag; + dentry->d_inode->i_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; @@ -339,7 +339,7 @@ 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)", + DEBUG("Add resource for `%s' (size = %"PRIu64")", dentry->file_name_utf8, lte->resource_entry.original_size); copy_hash(lte->hash, attr_hash); @@ -348,31 +348,33 @@ 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. */ - if (dentry->lte) { + * dentry's inode. */ + if (dentry->d_inode->i_lte) { ERROR("Found two un-named data streams for " "`%s'", path); ret = WIMLIB_ERR_NTFS_3G; goto out_free_lte; } - dentry->lte = lte; + dentry->d_inode->i_lte = lte; } else { /* Named data stream. Put the reference to it in the * alternate data stream entries */ - struct ads_entry *new_ads_entry; + struct wim_ads_entry *new_ads_entry; size_t stream_name_utf8_len; - stream_name_utf8 = utf16_to_utf8((const char*)attr_record_name(actx->attr), - name_length * 2, - &stream_name_utf8_len); - if (!stream_name_utf8) + + 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 = dentry_add_ads(dentry, stream_name_utf8); + new_ads_entry = inode_add_ads(dentry->d_inode, stream_name_utf8); FREE(stream_name_utf8); if (!new_ads_entry) goto out_free_lte; wimlib_assert(new_ads_entry->stream_name_len == name_length * 2); - + new_ads_entry->lte = lte; } } @@ -396,26 +398,28 @@ out_put_actx: } struct readdir_ctx { - struct dentry *parent; + struct wim_dentry *parent; ntfs_inode *dir_ni; char *path; size_t path_len; - 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 flags; + 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, +build_dentry_tree_ntfs_recursive(struct wim_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 wim_lookup_table *lookup_table, struct sd_set *sd_set, const struct capture_config *config, ntfs_volume **ntfs_vol_p, - int flags); + 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, @@ -425,19 +429,17 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, struct readdir_ctx *ctx; size_t utf8_name_len; char *utf8_name; - struct dentry *child = NULL; + struct wim_dentry *child = NULL; int ret; size_t path_len; if (name_type == FILE_NAME_DOS) return 0; - ret = -1; - - utf8_name = utf16_to_utf8((const char*)name, name_len * 2, - &utf8_name_len); - if (!utf8_name) - goto out; + ret = utf16_to_utf8((const char*)name, name_len * 2, + &utf8_name, &utf8_name_len); + if (ret != 0) + return -1; if (utf8_name[0] == '.' && (utf8_name[1] == '\0' || @@ -451,7 +453,7 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, ntfs_inode *ni = ntfs_inode_open(ctx->dir_ni->vol, mref); if (!ni) { ERROR_WITH_ERRNO("Failed to open NTFS inode"); - ret = 1; + goto out_free_utf8_name; } path_len = ctx->path_len; if (path_len != 1) @@ -462,64 +464,71 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, ni, ctx->path, path_len, name_type, ctx->lookup_table, ctx->sd_set, ctx->config, ctx->ntfs_vol_p, - ctx->flags); + ctx->add_image_flags, + ctx->progress_func); if (child) - link_dentry(child, ctx->parent); + dentry_add_child(ctx->parent, child); ntfs_inode_close(ni); out_free_utf8_name: FREE(utf8_name); -out: return ret; } -static int change_dentry_short_name(struct dentry *dentry, +static int change_dentry_short_name(struct wim_dentry *dentry, const char short_name_utf8[], int short_name_utf8_len) { size_t short_name_utf16_len; char *short_name_utf16; - short_name_utf16 = utf8_to_utf16(short_name_utf8, short_name_utf8_len, - &short_name_utf16_len); - if (!short_name_utf16) { - ERROR_WITH_ERRNO("Failed to convert short name to UTF-16"); - return WIMLIB_ERR_NOMEM; + 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; } - dentry->short_name = short_name_utf16; - dentry->short_name_len = short_name_utf16_len; - return 0; + return ret; } -/*#define HAVE_NTFS_INODE_FUNCTIONS*/ - /* 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, +static int build_dentry_tree_ntfs_recursive(struct wim_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 wim_lookup_table *lookup_table, struct sd_set *sd_set, const struct capture_config *config, ntfs_volume **ntfs_vol_p, - int flags) + int add_image_flags, + wimlib_progress_func_t progress_func) { u32 attributes; int mrec_flags; - u32 sd_size = 0; int ret; - char dos_name_utf8[64]; - struct dentry *root; + struct wim_dentry *root; + + if (exclude_path(path, config, false)) { + if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + && progress_func) + { + union wimlib_progress_info info; + info.scan.cur_path = path; + info.scan.excluded = true; + progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); + } + *root_p = NULL; + return 0; + } mrec_flags = ni->mrec->flags; -#ifdef HAVE_NTFS_INODE_FUNCTIONS - attributes = ntfs_get_inode_attributes(ni); -#else struct SECURITY_CONTEXT ctx; memset(&ctx, 0, sizeof(ctx)); ctx.vol = ni->vol; @@ -531,35 +540,33 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, path); return WIMLIB_ERR_NTFS_3G; } -#endif - if (exclude_path(path, config, false)) { - if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) { - const char *file_type; - if (attributes & MFT_RECORD_IS_DIRECTORY) - file_type = "directory"; - else - file_type = "file"; - printf("Excluding %s `%s' from capture\n", - file_type, path); - } - *root_p = NULL; - return 0; + if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + && progress_func) + { + union wimlib_progress_info info; + info.scan.cur_path = path; + info.scan.excluded = false; + progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } - if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) - printf("Scanning `%s'\n", path); - - root = new_dentry(path_basename(path)); - if (!root) - return WIMLIB_ERR_NOMEM; + root = new_dentry_with_timeless_inode(path_basename(path)); + if (!root) { + if (errno == EILSEQ) + return WIMLIB_ERR_INVALID_UTF8_STRING; + else if (errno == ENOMEM) + return WIMLIB_ERR_NOMEM; + else + return WIMLIB_ERR_ICONV_NOT_AVAILABLE; + } *root_p = root; 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)); + sizeof(dos_name_utf8) - 1); if (ret > 0) { DEBUG("Changing short name of `%s'", path); ret = change_dentry_short_name(root, dos_name_utf8, @@ -567,7 +574,12 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, if (ret != 0) return ret; } else { - if (errno != ENODATA) { + if ( + #ifdef ENODATA + errno != ENODATA && + #endif + errno != EMLINK + ) { ERROR_WITH_ERRNO("Error getting DOS name " "of `%s'", path); return WIMLIB_ERR_NTFS_3G; @@ -575,12 +587,12 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, } } - root->creation_time = le64_to_cpu(ni->creation_time); - root->last_write_time = le64_to_cpu(ni->last_data_change_time); - root->last_access_time = le64_to_cpu(ni->last_access_time); - root->attributes = le32_to_cpu(attributes); - root->link_group_id = ni->mft_no; - root->resolved = true; + 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 */ @@ -600,7 +612,8 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, .sd_set = sd_set, .config = config, .ntfs_vol_p = ntfs_vol_p, - .flags = flags, + .add_image_flags = add_image_flags, + .progress_func = progress_func, }; ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir); if (ret != 0) { @@ -616,41 +629,6 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, if (ret != 0) return ret; -#ifdef HAVE_NTFS_INODE_FUNCTIONS - ret = ntfs_get_inode_security(ni, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - NULL, 0, &sd_size); - char sd[sd_size]; - ret = ntfs_get_inode_security(ni, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - sd, sd_size, &sd_size); - if (ret == 0) { - ERROR_WITH_ERRNO("Failed to get security information from " - "`%s'", path); - ret = WIMLIB_ERR_NTFS_3G; - } else { - if (ret > 0) { - /*print_security_descriptor(sd, sd_size);*/ - root->security_id = sd_set_add_sd(sd_set, sd, ret); - if (root->security_id == -1) { - ERROR("Out of memory"); - return WIMLIB_ERR_NOMEM; - } - DEBUG("Added security ID = %u for `%s'", - root->security_id, path); - } else { - root->security_id = -1; - DEBUG("No security ID for `%s'", path); - } - ret = 0; - } -#else char _sd[1]; char *sd = _sd; errno = 0; @@ -663,46 +641,52 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, ni, dir_ni, sd, ret); } if (ret > 0) { - root->security_id = sd_set_add_sd(sd_set, sd, ret); - if (root->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->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->security_id = -1; + root->d_inode->i_security_id = -1; DEBUG("No security ID for `%s'", path); } -#endif return ret; } -static 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 flags, - void *extra_arg) +int build_dentry_tree_ntfs(struct wim_dentry **root_p, + const char *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); @@ -729,6 +713,7 @@ static int build_dentry_tree_ntfs(struct dentry **root_p, char *path = MALLOC(32768); if (!path) { ERROR("Could not allocate memory for NTFS pathname"); + ret = WIMLIB_ERR_NOMEM; goto out_cleanup; } @@ -737,13 +722,18 @@ static int build_dentry_tree_ntfs(struct dentry **root_p, ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1, FILE_NAME_POSIX, lookup_table, &sd_set, config, ntfs_vol_p, - flags); + 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'", @@ -758,34 +748,3 @@ out: } return ret; } - - - -WIMLIBAPI int wimlib_add_image_from_ntfs_volume(WIMStruct *w, - const char *device, - const char *name, - const char *config_str, - size_t config_len, - int flags) -{ - if (flags & (WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE)) { - ERROR("Cannot dereference files when capturing directly from NTFS"); - return WIMLIB_ERR_INVALID_PARAM; - } - return do_add_image(w, device, name, config_str, config_len, flags, - build_dentry_tree_ntfs, &w->ntfs_vol); -} - -#else /* WITH_NTFS_3G */ -WIMLIBAPI int wimlib_add_image_from_ntfs_volume(WIMStruct *w, - const char *device, - const char *name, - const char *config_str, - size_t config_len, - int flags) -{ - ERROR("wimlib was compiled without support for NTFS-3g, so"); - ERROR("we cannot capture a WIM image directly from a NTFS volume"); - return WIMLIB_ERR_UNSUPPORTED; -} -#endif /* WITH_NTFS_3G */