static int
capture_ntfs_streams(struct wim_dentry *dentry,
ntfs_inode *ni,
- mbchar *path,
+ char *path,
size_t path_len,
struct wim_lookup_table *lookup_table,
ntfs_volume **ntfs_vol_p,
struct readdir_ctx {
struct wim_dentry *parent;
ntfs_inode *dir_ni;
- mbchar *path;
+ char *path;
size_t path_len;
struct wim_lookup_table *lookup_table;
struct sd_set *sd_set;
build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
ntfs_inode *dir_ni,
ntfs_inode *ni,
- mbchar *path,
+ char *path,
size_t path_len,
int name_type,
struct wim_lookup_table *lookup_table,
{
struct readdir_ctx *ctx;
size_t mbs_name_nbytes;
- mbchar *mbs_name;
+ char *mbs_name;
struct wim_dentry *child;
int ret;
size_t path_len;
if (ret != 0 || name_type == FILE_NAME_DOS)
goto out;
}
- ret = utf16le_to_mbs(name, name_nbytes,
- &mbs_name, &mbs_name_nbytes);
+ ret = utf16le_to_tstr(name, name_nbytes,
+ &mbs_name, &mbs_name_nbytes);
if (ret)
goto out;
build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
ntfs_inode *dir_ni,
ntfs_inode *ni,
- mbchar *path,
+ char *path,
size_t path_len,
int name_type,
struct wim_lookup_table *lookup_table,
int
build_dentry_tree_ntfs(struct wim_dentry **root_p,
- const mbchar *device,
+ const char *device,
struct wim_lookup_table *lookup_table,
- struct wim_security_data *sd,
+ struct sd_set *sd_set,
const struct capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func,
ntfs_volume *vol;
ntfs_inode *root_ni;
int ret;
- struct sd_set sd_set = {
- .sd = sd,
- .rb_root = {NULL},
- };
ntfs_volume **ntfs_vol_p = extra_arg;
DEBUG("Mounting NTFS volume `%s' read-only", device);
/* Currently we assume that all the paths fit into this length and there
* is no check for overflow. */
- mbchar *path = MALLOC(32768);
+ char *path = MALLOC(32768);
if (!path) {
ERROR("Could not allocate memory for NTFS pathname");
ret = WIMLIB_ERR_NOMEM;
path[1] = '\0';
ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1,
FILE_NAME_POSIX, lookup_table,
- &sd_set,
+ 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);