struct sd_node *right;
};
-/* Frees a security descriptor index tree. */
-static void free_sd_set(struct sd_node *root)
+static void free_sd_tree(struct sd_node *root)
{
if (root) {
- free_sd_set(root->left);
- free_sd_set(root->right);
+ 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)
lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
lte->resource_entry.original_size = actx->attr->data_size;
lte->resource_entry.size = actx->attr->data_size;
+ 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);
}
ntfs_volume **ntfs_vol_p;
};
-static int __build_dentry_tree_ntfs(struct dentry **root_p, ntfs_inode *ni,
- char path[], size_t path_len,
- struct lookup_table *lookup_table,
- struct sd_set *sd_set,
- const struct capture_config *config,
- ntfs_volume **ntfs_vol_p);
-
+static int
+build_dentry_tree_ntfs_recursive(struct dentry **root_p, ntfs_inode *ni,
+ char path[], size_t path_len,
+ struct lookup_table *lookup_table,
+ struct sd_set *sd_set,
+ const struct capture_config *config,
+ ntfs_volume **ntfs_vol_p);
static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
const int name_len, const int name_type,
struct readdir_ctx *ctx;
size_t utf8_name_len;
char *utf8_name;
- struct dentry *child;
+ struct 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 u8*)name, name_len * 2,
ctx->path[path_len++] = '/';
memcpy(ctx->path + path_len, utf8_name, utf8_name_len + 1);
path_len += utf8_name_len;
- ret = __build_dentry_tree_ntfs(&child, ni, ctx->path, path_len,
- ctx->lookup_table, ctx->sd_set,
- ctx->config, ctx->ntfs_vol_p);
- DEBUG("Linking dentry `%s' with parent `%s'",
- child->file_name_utf8, ctx->parent->file_name_utf8);
-
- link_dentry(child, ctx->parent);
- DEBUG("Return %d", ret);
+ ret = build_dentry_tree_ntfs_recursive(&child, ni, ctx->path, path_len,
+ ctx->lookup_table, ctx->sd_set,
+ ctx->config, ctx->ntfs_vol_p);
+
+ if (child) {
+ DEBUG("Linking dentry `%s' with parent `%s'",
+ child->file_name_utf8, ctx->parent->file_name_utf8);
+ link_dentry(child, ctx->parent);
+ }
out_close_ni:
ntfs_inode_close(ni);
out_free_utf8_name:
* 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(struct dentry **root_p, ntfs_inode *ni,
- char path[], size_t path_len,
- struct lookup_table *lookup_table,
- struct sd_set *sd_set,
- const struct capture_config *config,
- ntfs_volume **ntfs_vol_p)
+static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
+ ntfs_inode *ni,
+ char path[], size_t path_len,
+ struct lookup_table *lookup_table,
+ struct sd_set *sd_set,
+ const struct capture_config *config,
+ ntfs_volume **ntfs_vol_p)
{
u32 attributes;
int mrec_flags;
if (!root)
return WIMLIB_ERR_NOMEM;
+ *root_p = root;
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->security_id = le32_to_cpu(ni->security_id);
root->attributes = le32_to_cpu(attributes);
- root->hard_link = ni->mft_no;
- root->resolved = true;
+ root->hard_link = ni->mft_no;
+ root->resolved = true;
if (attributes & FILE_ATTR_REPARSE_POINT) {
DEBUG("Reparse point `%s'", path);
.ntfs_vol_p = ntfs_vol_p,
};
ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir);
- if (ret != 0)
+ if (ret != 0) {
+ ERROR_WITH_ERRNO("ntfs_readdir()");
ret = WIMLIB_ERR_NTFS_3G;
+ }
} else {
DEBUG("Normal file `%s'", path);
/* Normal file */
if (ret != 0)
return ret;
- DEBUG("Getting security information from `%s'", path);
ret = ntfs_inode_get_security(ni,
OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
}
ret = 0;
}
- *root_p = root;
return ret;
}
ntfs_volume *vol;
ntfs_inode *root_ni;
int ret = 0;
- struct sd_set tree;
- tree.sd = sd;
- tree.root = NULL;
+ struct sd_set sd_set;
+ sd_set.sd = sd;
+ sd_set.root = NULL;
ntfs_volume **ntfs_vol_p = extra_arg;
DEBUG("Mounting NTFS volume `%s' read-only", device);
ret = WIMLIB_ERR_NTFS_3G;
goto out;
}
- char path[4096];
+ char *path = MALLOC(32769);
+ if (!path) {
+ ERROR("Could not allocate memory for NTFS pathname");
+ goto out_cleanup;
+ }
path[0] = '/';
path[1] = '\0';
- ret = __build_dentry_tree_ntfs(root_p, root_ni, path, 1,
- lookup_table, &tree, config,
- ntfs_vol_p);
+ ret = build_dentry_tree_ntfs_recursive(root_p, root_ni, path, 1,
+ lookup_table, &sd_set,
+ config, ntfs_vol_p);
+out_cleanup:
+ FREE(path);
ntfs_inode_close(root_ni);
+ destroy_sd_set(&sd_set);
out:
- if (ntfs_umount(vol, FALSE) != 0) {
- ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device);
- if (ret == 0)
- ret = WIMLIB_ERR_NTFS_3G;
+ if (ret) {
+ if (ntfs_umount(vol, FALSE) != 0) {
+ ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'",
+ device);
+ if (ret == 0)
+ ret = WIMLIB_ERR_NTFS_3G;
+ }
+ } else {
+ *ntfs_vol_p = vol;
}
return ret;
}