return (ntfschar*)((u8*)ar + le16_to_cpu(ar->name_offset));
}
+static ntfs_attr *
+open_ntfs_attr(ntfs_inode *ni, struct ntfs_location *loc)
+{
+ ntfs_attr *na;
+
+ na = ntfs_attr_open(ni,
+ loc->is_reparse_point ? AT_REPARSE_POINT : AT_DATA,
+ loc->stream_name,
+ loc->stream_name_nchars);
+ if (!na) {
+ ERROR_WITH_ERRNO("Failed to open attribute of \"%"TS"\" in "
+ "NTFS volume", loc->path);
+ }
+ return na;
+}
+
int
read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte,
u64 size,
int _ignored_flags)
{
struct ntfs_location *loc = lte->ntfs_loc;
- ntfs_volume *vol = *loc->ntfs_vol_p;
+ ntfs_volume *vol = loc->ntfs_vol;
ntfs_inode *ni;
ntfs_attr *na;
s64 pos;
goto out;
}
- na = ntfs_attr_open(ni,
- loc->is_reparse_point ? AT_REPARSE_POINT : AT_DATA,
- loc->stream_name,
- loc->stream_name_nchars);
+ na = open_ntfs_attr(ni, loc);
if (!na) {
- ERROR_WITH_ERRNO("Failed to open attribute of \"%"TS"\" in "
- "NTFS volume", loc->path);
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_ntfs_inode;
}
- /*if (is_reparse_point) {*/
- /*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;*/
- /*}*/
-
if (cb)
out_buf = alloca(WIM_CHUNK_SIZE);
else
out_buf = ctx_or_buf;
- pos = 0;
- bytes_remaining = na->data_size;
+ pos = (loc->is_reparse_point) ? 8 : 0;
+ bytes_remaining = size;
while (bytes_remaining) {
s64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE);
if (ntfs_attr_pread(na, pos, to_read, out_buf) != to_read) {
return ret;
}
+static int
+read_reparse_tag(ntfs_inode *ni, struct ntfs_location *loc,
+ u32 *reparse_tag_ret)
+{
+ int ret;
+ u8 buf[8];
+ ntfs_attr *na;
+
+ na = open_ntfs_attr(ni, loc);
+ if (!na) {
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out;
+ }
+
+ if (ntfs_attr_pread(na, 0, 8, buf) != 8) {
+ ERROR_WITH_ERRNO("Error reading reparse data");
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out_close_ntfs_attr;
+ }
+ *reparse_tag_ret = le32_to_cpu(*(u32*)buf);
+ DEBUG("ReparseTag = %#x", *reparse_tag_ret);
+ ret = 0;
+out_close_ntfs_attr:
+ ntfs_attr_close(na);
+out:
+ return ret;
+
+}
+
/* Load the streams from a file or reparse point in the NTFS volume into the WIM
* lookup table */
static int
char *path,
size_t path_len,
struct wim_lookup_table *lookup_table,
- ntfs_volume **ntfs_vol_p,
+ ntfs_volume *vol,
ATTR_TYPES type)
{
ntfs_attr_search_ctx *actx;
- struct ntfs_location *ntfs_loc = NULL;
- int ret = 0;
+ struct ntfs_location *ntfs_loc;
+ int ret;
struct wim_lookup_table_entry *lte;
DEBUG2("Capturing NTFS data streams from `%s'", path);
u32 stream_id;
if (data_size == 0) {
- if (errno != 0) {
- ERROR_WITH_ERRNO("Failed to get size of attribute of "
- "`%s'", path);
- ret = WIMLIB_ERR_NTFS_3G;
- goto out_put_actx;
- }
/* Empty stream. No lookup table entry is needed. */
lte = NULL;
+ 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_p = ntfs_vol_p;
+ }
+ 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->ntfs_loc = ntfs_loc;
+ }
lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
- #if 0
+ lte->ntfs_loc = ntfs_loc;
+ ntfs_loc = NULL;
if (type == AT_REPARSE_POINT) {
- ntfs_loc->is_reparse_point = true;
+ if (data_size < 8) {
+ ERROR("Invalid reparse data (only %u bytes)!",
+ (unsigned)data_size);
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out_free_lte;
+ }
+ lte->ntfs_loc->is_reparse_point = true;
lte->resource_entry.original_size = data_size - 8;
- lte->resource_entry.size = data_size - 8;
+ ret = read_reparse_tag(ni, lte->ntfs_loc,
+ &inode->i_reparse_tag);
+ if (ret)
+ goto out_free_lte;
} else {
- ntfs_loc->is_reparse_point = false;
+ lte->ntfs_loc->is_reparse_point = false;
lte->resource_entry.original_size = data_size;
- lte->resource_entry.size = data_size;
}
- #else
- ntfs_loc->is_reparse_point = (type == AT_REPARSE_POINT);
- lte->resource_entry.original_size = data_size;
- #endif
- ntfs_loc = NULL;
}
if (name_length == 0) {
/* Unnamed data stream. Put the reference to it in the
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;
inode, stream_id);
}
}
- ret = 0;
+ if (errno == ENOENT) {
+ ret = 0;
+ } else {
+ ERROR_WITH_ERRNO("Error listing NTFS attributes from `%s'",
+ path);
+ ret = WIMLIB_ERR_NTFS_3G;
+ }
goto out_put_actx;
out_free_lte:
free_lookup_table_entry(lte);
if (ret == 0)
DEBUG2("Successfully captured NTFS streams from `%s'", path);
else
- ERROR("Failed to capture NTFS streams from `%s", path);
+ ERROR("Failed to capture NTFS streams from `%s'", path);
return ret;
}
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 **ntfs_vol_p;
- int add_image_flags;
- wimlib_progress_func_t progress_func;
+ ntfs_volume *vol;
+ 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_p,
- int add_image_flags,
- wimlib_progress_func_t progress_func);
+ ntfs_volume *ntfs_vol,
+ 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->ntfs_vol_p,
- 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 **ntfs_vol_p,
- int add_image_flags,
- wimlib_progress_func_t progress_func)
+ ntfs_volume *vol,
+ struct add_image_params *params)
{
u32 attributes;
int ret;
struct wim_dentry *root;
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;
/* Get file attributes */
struct SECURITY_CONTEXT ctx;
memset(&ctx, 0, sizeof(ctx));
- ctx.vol = ni->vol;
+ ctx.vol = vol;
ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ATTRIB,
ni, dir_ni, (char *)&attributes,
sizeof(u32));
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;
if (inode->i_nlink > 1) /* Shared inode; nothing more to do */
goto out;
- if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name */
+ if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */
root->is_win32_name = 1;
inode->i_creation_time = le64_to_cpu(ni->creation_time);
inode->i_last_write_time = le64_to_cpu(ni->last_data_change_time);
inode->i_attributes = le32_to_cpu(attributes);
inode->i_resolved = 1;
- if (attributes & FILE_ATTR_REPARSE_POINT) {
- /* Junction point, symbolic link, or other reparse point */
- ret = capture_ntfs_streams(inode, ni, path,
- path_len, lookup_table,
- ntfs_vol_p, AT_REPARSE_POINT);
- } else if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
+ if (attributes & FILE_ATTR_REPARSE_POINT)
+ stream_type = AT_REPARSE_POINT;
+ else
+ stream_type = AT_DATA;
+
+ /* Capture the file's streams; more specifically, this is supposed to:
+ *
+ * - Regular files: capture unnamed data stream and any named data
+ * streams
+ * - Directories: capture any named data streams
+ * - Reparse points: capture reparse data only
+ */
+ ret = capture_ntfs_streams(inode, ni, path, path_len,
+ params->lookup_table, vol, stream_type);
+ if (ret)
+ goto out;
+
+ if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
- /* Normal directory */
+ /* Recurse to directory children */
s64 pos = 0;
struct dos_name_map dos_name_map = { .rb_root = {.rb_node = NULL} };
struct readdir_ctx ctx = {
.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,
- .ntfs_vol_p = ntfs_vol_p,
- .add_image_flags = add_image_flags,
- .progress_func = progress_func,
+ .vol = vol,
+ .params = params,
};
ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir);
if (ret) {
&dos_name_map);
}
destroy_dos_name_map(&dos_name_map);
- } else {
- /* Normal file */
- ret = capture_ntfs_streams(inode, ni, path,
- path_len, lookup_table,
- ntfs_vol_p, AT_DATA);
+ if (ret)
+ goto out;
}
- 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
+do_ntfs_umount(struct _ntfs_volume *vol)
+{
+ DEBUG("Unmounting NTFS volume");
+ if (ntfs_umount(vol, FALSE))
+ return WIMLIB_ERR_NTFS_3G;
+ else
+ return 0;
+}
+
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;
int ret;
- ntfs_volume **ntfs_vol_p = extra_arg;
DEBUG("Mounting NTFS volume `%s' read-only", device);
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, ntfs_vol_p,
- add_image_flags,
- progress_func);
+ FILE_NAME_POSIX, vol, params);
out_cleanup:
FREE(path);
ntfs_inode_close(root_ni);
ntfs_inode_close(vol->secure_ni);
if (ret) {
- if (ntfs_umount(vol, FALSE) != 0) {
+ if (do_ntfs_umount(vol)) {
ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'",
device);
if (ret == 0)
} 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_vol_p = vol;
+ *(ntfs_volume**)params->extra_arg = vol;
}
return ret;
}
git://wimlib.net / wimlib / blobdiff