ntfs_loc = NULL;
} else {
ntfs_loc = CALLOC(1, sizeof(*ntfs_loc));
- if (!ntfs_loc)
+ if (!ntfs_loc) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_put_actx;
+ }
ntfs_loc->ntfs_vol = vol;
ntfs_loc->path = MALLOC(path_len + 1);
- if (!ntfs_loc->path)
+ if (!ntfs_loc->path) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_ntfs_loc;
+ }
memcpy(ntfs_loc->path, path, path_len + 1);
if (name_length) {
ntfs_loc->stream_name = MALLOC(name_length * 2);
- if (!ntfs_loc->stream_name)
+ if (!ntfs_loc->stream_name) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_ntfs_loc;
+ }
memcpy(ntfs_loc->stream_name,
attr_record_name(actx->attr),
actx->attr->name_length * 2);
}
lte = new_lookup_table_entry();
- if (!lte)
+ if (!lte) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_ntfs_loc;
+ }
lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
lte->ntfs_loc = ntfs_loc;
ntfs_loc = NULL;
new_ads_entry = inode_add_ads_utf16le(inode,
attr_record_name(actx->attr),
name_length * 2);
- if (!new_ads_entry)
+ if (!new_ads_entry) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_lte;
+ }
wimlib_assert(new_ads_entry->stream_name_nbytes == name_length * 2);
stream_id = new_ads_entry->stream_id;
new_ads_entry->lte = lte;
ntfs_inode *dir_ni;
char *path;
size_t path_len;
- struct wim_lookup_table *lookup_table;
- struct wim_inode_table *inode_table;
- struct sd_set *sd_set;
struct dos_name_map *dos_name_map;
- const struct wimlib_capture_config *config;
ntfs_volume *vol;
- int add_image_flags;
- wimlib_progress_func_t progress_func;
+ struct add_image_params *params;
};
static int
char *path,
size_t path_len,
int name_type,
- struct wim_lookup_table *lookup_table,
- struct wim_inode_table *inode_table,
- struct sd_set *sd_set,
- const struct wimlib_capture_config *config,
ntfs_volume *ntfs_vol,
- int add_image_flags,
- wimlib_progress_func_t progress_func);
+ struct add_image_params *params);
static int
wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
child = NULL;
ret = build_dentry_tree_ntfs_recursive(&child, ctx->dir_ni,
ni, ctx->path, path_len, name_type,
- ctx->lookup_table,
- ctx->inode_table,
- ctx->sd_set,
- ctx->config, ctx->vol,
- ctx->add_image_flags,
- ctx->progress_func);
+ ctx->vol, ctx->params);
if (child)
dentry_add_child(ctx->parent, child);
ntfs_inode_close(ni);
char *path,
size_t path_len,
int name_type,
- struct wim_lookup_table *lookup_table,
- struct wim_inode_table *inode_table,
- struct sd_set *sd_set,
- const struct wimlib_capture_config *config,
ntfs_volume *vol,
- int add_image_flags,
- wimlib_progress_func_t progress_func)
+ struct add_image_params *params)
{
u32 attributes;
int ret;
struct wim_inode *inode;
ATTR_TYPES stream_type;
- if (exclude_path(path, path_len, config, false)) {
+ if (exclude_path(path, path_len, params->config, false)) {
/* Exclude a file or directory tree based on the capture
* configuration file */
- if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE)
- && progress_func)
+ if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE)
+ && params->progress_func)
{
union wimlib_progress_info info;
info.scan.cur_path = path;
info.scan.excluded = true;
- progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+ params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
}
root = NULL;
ret = 0;
return WIMLIB_ERR_NTFS_3G;
}
- if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
- && progress_func)
+ if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
+ && params->progress_func)
{
union wimlib_progress_info info;
info.scan.cur_path = path;
info.scan.excluded = false;
- progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+ params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
}
/* Create a WIM dentry with an associated inode, which may be shared */
- ret = inode_table_new_dentry(inode_table,
+ ret = inode_table_new_dentry(params->inode_table,
path_basename_with_len(path, path_len),
- ni->mft_no,
- 0,
- &root);
+ ni->mft_no, 0, false, &root);
if (ret)
return ret;
* - Directories: capture any named data streams
* - Reparse points: capture reparse data only
*/
- ret = capture_ntfs_streams(inode, ni, path, path_len, lookup_table,
- vol, stream_type);
+ ret = capture_ntfs_streams(inode, ni, path, path_len,
+ params->lookup_table, vol, stream_type);
if (ret)
goto out;
.dir_ni = ni,
.path = path,
.path_len = path_len,
- .lookup_table = lookup_table,
- .inode_table = inode_table,
- .sd_set = sd_set,
.dos_name_map = &dos_name_map,
- .config = config,
.vol = vol,
- .add_image_flags = add_image_flags,
- .progress_func = progress_func,
+ .params = params,
};
ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir);
if (ret) {
goto out;
}
- if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) {
+ if (!(params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) {
/* Get security descriptor */
char _sd[1];
char *sd = _sd;
ni, dir_ni, sd, ret);
}
if (ret > 0) {
- inode->i_security_id = sd_set_add_sd(sd_set, sd, ret);
+ inode->i_security_id = sd_set_add_sd(params->sd_set,
+ sd, ret);
if (inode->i_security_id == -1) {
ERROR("Out of memory");
ret = WIMLIB_ERR_NOMEM;
if (ret == 0)
*root_ret = root;
else
- free_dentry_tree(root, lookup_table);
+ free_dentry_tree(root, params->lookup_table);
return ret;
}
int
build_dentry_tree_ntfs(struct wim_dentry **root_p,
const char *device,
- struct wim_lookup_table *lookup_table,
- struct wim_inode_table *inode_table,
- struct sd_set *sd_set,
- const struct wimlib_capture_config *config,
- int add_image_flags,
- wimlib_progress_func_t progress_func,
- void *extra_arg)
+ struct add_image_params *params)
{
ntfs_volume *vol;
ntfs_inode *root_ni;
path[0] = '/';
path[1] = '\0';
ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1,
- FILE_NAME_POSIX, lookup_table,
- inode_table,
- sd_set,
- config, vol,
- add_image_flags,
- progress_func);
+ FILE_NAME_POSIX, vol, params);
out_cleanup:
FREE(path);
ntfs_inode_close(root_ni);
} else {
/* We need to leave the NTFS volume mounted so that we can read
* the NTFS files again when we are actually writing the WIM */
- *(ntfs_volume**)extra_arg = vol;
+ *(ntfs_volume**)params->extra_arg = vol;
}
return ret;
}
git://wimlib.net / wimlib / blobdiff