#include "wimlib/reparse.h"
#include "wimlib/security.h"
-static inline ntfschar *
-attr_record_name(ATTR_RECORD *ar)
+/* A reference-counted NTFS volume than is automatically unmounted when the
+ * reference count reaches 0 */
+struct ntfs_volume_wrapper {
+ ntfs_volume *vol;
+ size_t refcnt;
+};
+
+/* Description of where data is located in an NTFS volume */
+struct ntfs_location {
+ struct ntfs_volume_wrapper *volume;
+ u64 mft_no;
+ ATTR_TYPES attr_type;
+ u32 attr_name_nchars;
+ utf16lechar *attr_name;
+ u64 sort_key;
+};
+
+static struct ntfs_volume_wrapper *
+get_ntfs_volume(struct ntfs_volume_wrapper *volume)
+{
+ volume->refcnt++;
+ return volume;
+}
+
+static void
+put_ntfs_volume(struct ntfs_volume_wrapper *volume)
{
- return (ntfschar*)((u8*)ar + le16_to_cpu(ar->name_offset));
+ if (--volume->refcnt == 0) {
+ ntfs_umount(volume->vol, FALSE);
+ FREE(volume);
+ }
+}
+
+static inline const ntfschar *
+attr_record_name(const ATTR_RECORD *record)
+{
+ return (const ntfschar *)
+ ((const u8 *)record + le16_to_cpu(record->name_offset));
}
static ntfs_attr *
{
ntfs_attr *na;
- na = ntfs_attr_open(ni,
- (ATTR_TYPES)loc->attr_type,
- loc->attr_name,
+ na = ntfs_attr_open(ni, loc->attr_type, loc->attr_name,
loc->attr_name_nchars);
if (!na) {
- ERROR_WITH_ERRNO("Failed to open attribute of \"%"TS"\" in "
- "NTFS volume", loc->path);
+ ERROR_WITH_ERRNO("Failed to open attribute of NTFS inode %"PRIu64,
+ loc->mft_no);
}
return na;
}
int
read_ntfs_attribute_prefix(const struct blob_descriptor *blob, u64 size,
- consume_data_callback_t cb, void *cb_ctx)
+ const struct read_blob_callbacks *cbs)
{
const struct ntfs_location *loc = blob->ntfs_loc;
- ntfs_volume *vol = loc->ntfs_vol;
+ ntfs_volume *vol = loc->volume->vol;
ntfs_inode *ni;
ntfs_attr *na;
s64 pos;
int ret;
u8 buf[BUFFER_SIZE];
- ni = ntfs_pathname_to_inode(vol, NULL, loc->path);
+ ni = ntfs_inode_open(vol, loc->mft_no);
if (!ni) {
- ERROR_WITH_ERRNO("Can't find NTFS inode for \"%"TS"\"", loc->path);
+ ERROR_WITH_ERRNO("Failed to open NTFS inode %"PRIu64,
+ loc->mft_no);
ret = WIMLIB_ERR_NTFS_3G;
goto out;
}
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 \"%"TS"\"", loc->path);
+ ERROR_WITH_ERRNO("Error reading data from NTFS inode "
+ "%"PRIu64, loc->mft_no);
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_ntfs_attr;
}
pos += to_read;
bytes_remaining -= to_read;
- ret = cb(buf, to_read, cb_ctx);
+ ret = call_consume_chunk(buf, to_read, cbs);
if (ret)
goto out_close_ntfs_attr;
}
return ret;
}
+void
+free_ntfs_location(struct ntfs_location *loc)
+{
+ put_ntfs_volume(loc->volume);
+ FREE(loc->attr_name);
+ FREE(loc);
+}
+
+struct ntfs_location *
+clone_ntfs_location(const struct ntfs_location *loc)
+{
+ struct ntfs_location *new = memdup(loc, sizeof(*loc));
+ if (!new)
+ goto err0;
+ if (loc->attr_name) {
+ new->attr_name = utf16le_dup(loc->attr_name);
+ if (!new->attr_name)
+ goto err1;
+ }
+ new->volume = get_ntfs_volume(loc->volume);
+ return new;
+
+err1:
+ FREE(new);
+err0:
+ return NULL;
+}
+
+int
+cmp_ntfs_locations(const struct ntfs_location *loc1,
+ const struct ntfs_location *loc2)
+{
+ return cmp_u64(loc1->sort_key, loc2->sort_key);
+}
+
static int
read_reparse_tag(ntfs_inode *ni, struct ntfs_location *loc,
u32 *reparse_tag_ret)
goto out_close_ntfs_attr;
}
*reparse_tag_ret = le32_to_cpu(reparse_tag);
- DEBUG("ReparseTag = %#x", *reparse_tag_ret);
ret = 0;
out_close_ntfs_attr:
ntfs_attr_close(na);
}
}
-/* Load attributes of the specified type from a file in the NTFS volume */
+/* When sorting blobs located in NTFS volumes for sequential reading, we sort
+ * first by starting LCN of the attribute if available, otherwise no sort order
+ * is defined. This usually results in better sequential access to the volume.
+ */
static int
-load_ntfs_attrs_with_type(struct wim_inode *inode,
+set_attr_sort_key(ntfs_inode *ni, struct ntfs_location *loc)
+{
+ ntfs_attr *na;
+ runlist_element *rl;
+
+ na = open_ntfs_attr(ni, loc);
+ if (!na)
+ return WIMLIB_ERR_NTFS_3G;
+
+ rl = ntfs_attr_find_vcn(na, 0);
+ if (rl && rl->lcn != LCN_HOLE)
+ loc->sort_key = rl->lcn;
+ else
+ loc->sort_key = 0;
+
+ ntfs_attr_close(na);
+ return 0;
+}
+
+/* Save information about an NTFS attribute (stream) to a WIM inode. */
+static int
+scan_ntfs_attr(struct wim_inode *inode,
+ ntfs_inode *ni,
+ const char *path,
+ size_t path_len,
+ struct list_head *unhashed_blobs,
+ struct ntfs_volume_wrapper *volume,
+ ATTR_TYPES type,
+ const ATTR_RECORD *record)
+{
+ const u64 data_size = ntfs_get_attribute_value_length(record);
+ const u32 name_nchars = record->name_length;
+ struct blob_descriptor *blob = NULL;
+ utf16lechar *stream_name = NULL;
+ struct wim_inode_stream *strm;
+ int ret;
+
+ if (unlikely(name_nchars)) {
+ /* Named stream */
+ stream_name = utf16le_dupz(attr_record_name(record),
+ name_nchars * sizeof(ntfschar));
+ if (!stream_name) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_cleanup;
+ }
+ }
+
+ /* If the stream is non-empty, set up a blob descriptor for it. */
+ if (data_size != 0) {
+ blob = new_blob_descriptor();
+ if (unlikely(!blob)) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_cleanup;
+ }
+
+ blob->ntfs_loc = CALLOC(1, sizeof(struct ntfs_location));
+ if (unlikely(!blob->ntfs_loc)) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_cleanup;
+ }
+
+ blob->blob_location = BLOB_IN_NTFS_VOLUME;
+ blob->size = data_size;
+ blob->ntfs_loc->volume = get_ntfs_volume(volume);
+ blob->ntfs_loc->attr_type = type;
+ blob->ntfs_loc->mft_no = ni->mft_no;
+
+ if (unlikely(name_nchars)) {
+ blob->ntfs_loc->attr_name = utf16le_dup(stream_name);
+ if (!blob->ntfs_loc->attr_name) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_cleanup;
+ }
+ blob->ntfs_loc->attr_name_nchars = name_nchars;
+ }
+
+ ret = set_attr_sort_key(ni, blob->ntfs_loc);
+ if (ret)
+ goto out_cleanup;
+
+ if (unlikely(type == AT_REPARSE_POINT)) {
+ if (blob->size < REPARSE_DATA_OFFSET) {
+ ERROR("Reparse data of \"%s\" "
+ "is invalid (only %"PRIu64" bytes)!",
+ path, data_size);
+ ret = WIMLIB_ERR_INVALID_REPARSE_DATA;
+ goto out_cleanup;
+ }
+ blob->size -= REPARSE_DATA_OFFSET;
+ ret = read_reparse_tag(ni, blob->ntfs_loc,
+ &inode->i_reparse_tag);
+ if (ret)
+ goto out_cleanup;
+ }
+ }
+
+ strm = inode_add_stream(inode,
+ attr_type_to_wimlib_stream_type(type),
+ stream_name ? stream_name : NO_STREAM_NAME,
+ blob);
+ if (unlikely(!strm)) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_cleanup;
+ }
+ prepare_unhashed_blob(blob, inode, strm->stream_id, unhashed_blobs);
+ blob = NULL;
+ ret = 0;
+out_cleanup:
+ free_blob_descriptor(blob);
+ FREE(stream_name);
+ return ret;
+}
+
+/* Scan attributes of the specified type from a file in the NTFS volume */
+static int
+scan_ntfs_attrs_with_type(struct wim_inode *inode,
ntfs_inode *ni,
- char *path,
+ const char *path,
size_t path_len,
struct list_head *unhashed_blobs,
- ntfs_volume *vol,
+ struct ntfs_volume_wrapper *volume,
ATTR_TYPES type)
{
ntfs_attr_search_ctx *actx;
- struct ntfs_location *ntfs_loc;
int ret;
- struct blob_descriptor *blob;
-
- DEBUG("Loading NTFS attributes from \"%s\"", path);
- /* Get context to search the attributes of the NTFS file. */
actx = ntfs_attr_get_search_ctx(ni, NULL);
if (!actx) {
- ERROR_WITH_ERRNO("Cannot get NTFS attribute search "
+ ERROR_WITH_ERRNO("Failed to get NTFS attribute search "
"context for \"%s\"", path);
return WIMLIB_ERR_NTFS_3G;
}
- /* Save each attribute */
while (!ntfs_attr_lookup(type, NULL, 0,
CASE_SENSITIVE, 0, NULL, 0, actx))
{
- u64 data_size = ntfs_get_attribute_value_length(actx->attr);
- size_t name_nchars = actx->attr->name_length;
- struct wim_inode_stream *strm;
- const utf16lechar *stream_name = NO_STREAM_NAME;
-
- if (data_size == 0) {
- /* Empty attribute. No blob is needed. */
- blob = NULL;
- ntfs_loc = NULL;
- } else {
- ntfs_loc = CALLOC(1, sizeof(*ntfs_loc));
- if (!ntfs_loc) {
- ret = WIMLIB_ERR_NOMEM;
- goto out_put_actx;
- }
- ntfs_loc->ntfs_vol = vol;
- ntfs_loc->attr_type = type;
- ntfs_loc->path = memdup(path, path_len + 1);
- if (!ntfs_loc->path) {
- ret = WIMLIB_ERR_NOMEM;
- goto out_free_ntfs_loc;
- }
- if (name_nchars) {
- ntfs_loc->attr_name =
- utf16le_dupz(attr_record_name(actx->attr),
- name_nchars * sizeof(ntfschar));
- if (!ntfs_loc->attr_name) {
- ret = WIMLIB_ERR_NOMEM;
- goto out_free_ntfs_loc;
- }
- ntfs_loc->attr_name_nchars = name_nchars;
- stream_name = ntfs_loc->attr_name;
- }
-
- blob = new_blob_descriptor();
- if (!blob) {
- ret = WIMLIB_ERR_NOMEM;
- goto out_free_ntfs_loc;
- }
- blob->blob_location = BLOB_IN_NTFS_VOLUME;
- blob->ntfs_loc = ntfs_loc;
- blob->size = data_size;
- ntfs_loc = NULL;
- if (type == AT_REPARSE_POINT) {
- if (data_size < REPARSE_DATA_OFFSET) {
- ERROR("Reparse data of \"%s\" "
- "is invalid (only %u bytes)!",
- path, (unsigned)data_size);
- ret = WIMLIB_ERR_NTFS_3G;
- goto out_free_blob;
- }
- blob->size -= REPARSE_DATA_OFFSET;
- ret = read_reparse_tag(ni, blob->ntfs_loc,
- &inode->i_reparse_tag);
- if (ret)
- goto out_free_blob;
- }
- }
-
- strm = inode_add_stream(inode,
- attr_type_to_wimlib_stream_type(type),
- stream_name,
- blob);
- if (!strm) {
- ret = WIMLIB_ERR_NOMEM;
- goto out_free_blob;
- }
- prepare_unhashed_blob(blob, inode, strm->stream_id, unhashed_blobs);
+ ret = scan_ntfs_attr(inode,
+ ni,
+ path,
+ path_len,
+ unhashed_blobs,
+ volume,
+ type,
+ actx->attr);
+ if (ret)
+ goto out_put_actx;
}
- if (errno == ENOENT) {
- ret = 0;
- } else {
+ if (errno != ENOENT) {
ERROR_WITH_ERRNO("Error listing NTFS attributes of \"%s\"", path);
ret = WIMLIB_ERR_NTFS_3G;
+ goto out_put_actx;
}
- goto out_put_actx;
-out_free_blob:
- free_blob_descriptor(blob);
-out_free_ntfs_loc:
- if (ntfs_loc) {
- FREE(ntfs_loc->path);
- FREE(ntfs_loc->attr_name);
- FREE(ntfs_loc);
- }
+ ret = 0;
out_put_actx:
ntfs_attr_put_search_ctx(actx);
- if (ret == 0)
- DEBUG("Successfully loaded NTFS attributes from \"%s\"", path);
- else
- ERROR("Failed to load NTFS attributes from \"%s\"", path);
+ return ret;
+}
+
+/* Load the security descriptor of an NTFS inode into the corresponding WIM
+ * inode and the WIM image's security descriptor set. */
+static noinline_for_stack int
+get_security_descriptor(ntfs_inode *ni, struct wim_inode *inode,
+ ntfs_volume *vol, struct wim_sd_set *sd_set)
+{
+ struct SECURITY_CONTEXT scx = {.vol = vol};
+ char _buf[4096];
+ char *buf = _buf;
+ size_t avail_size = sizeof(_buf);
+ int ret;
+
+retry:
+ ret = ntfs_get_ntfs_acl(&scx, ni, buf, avail_size);
+ if (unlikely(ret < 0)) {
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out;
+ }
+
+ if (unlikely(ret > avail_size)) {
+ if (unlikely(buf != _buf))
+ FREE(buf);
+ buf = MALLOC(ret);
+ if (!buf) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out;
+ }
+ avail_size = ret;
+ goto retry;
+ }
+
+ if (likely(ret > 0)) {
+ inode->i_security_id = sd_set_add_sd(sd_set, buf, ret);
+ if (unlikely(inode->i_security_id < 0)) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out;
+ }
+ }
+
+ ret = 0;
+out:
+ if (unlikely(buf != _buf))
+ FREE(buf);
return ret;
}
struct avl_tree_node index_node;
char dos_name[24];
int name_nbytes;
- le64 ntfs_ino;
+ u64 ntfs_ino;
};
#define DOS_NAME_NODE(avl_node) \
/* Inserts a new DOS name into the map */
static int
insert_dos_name(struct dos_name_map *map, const ntfschar *dos_name,
- size_t name_nbytes, le64 ntfs_ino)
+ size_t name_nbytes, u64 ntfs_ino)
{
struct dos_name_node *new_node;
- DEBUG("DOS name_len = %zu", name_nbytes);
new_node = MALLOC(sizeof(struct dos_name_node));
if (!new_node)
return WIMLIB_ERR_NOMEM;
if (avl_tree_insert(&map->root, &new_node->index_node,
_avl_cmp_by_ntfs_ino))
{
- /* This should be impossible since an NTFS inode cannot
- * have multiple DOS names, and we only should get each
- * DOS name entry once from the ntfs_readdir() calls. */
- ERROR("NTFS inode %"PRIu64" has multiple DOS names",
- le64_to_cpu(ntfs_ino));
+ /* This should be impossible since an NTFS inode cannot have
+ * multiple DOS names, and we only should get each DOS name
+ * entry once from the ntfs_readdir() calls. */
+ WARNING("NTFS inode %"PRIu64" has multiple DOS names", ntfs_ino);
FREE(new_node);
- return WIMLIB_ERR_NOMEM;
}
- DEBUG("Inserted DOS name for inode %"PRIu64, le64_to_cpu(ntfs_ino));
return 0;
}
struct dos_name_node dummy;
struct avl_tree_node *res;
- dummy.ntfs_ino = cpu_to_le64(ntfs_ino);
+ dummy.ntfs_ino = ntfs_ino;
res = avl_tree_lookup_node(map->root, &dummy.index_node,
_avl_cmp_by_ntfs_ino);
{
const struct dos_name_node *node;
- if (dentry->is_win32_name) {
+ if (dentry->d_is_win32_name) {
node = lookup_dos_name(map, dentry->d_inode->i_ino);
if (node) {
- dentry->short_name = utf16le_dupz(node->dos_name,
- node->name_nbytes);
- if (!dentry->short_name)
+ dentry->d_short_name = utf16le_dupz(node->dos_name,
+ node->name_nbytes);
+ if (!dentry->d_short_name)
return WIMLIB_ERR_NOMEM;
- dentry->short_name_nbytes = node->name_nbytes;
- DEBUG("Assigned DOS name to ino %"PRIu64,
- dentry->d_inode->i_ino);
+ dentry->d_short_name_nbytes = node->name_nbytes;
} else {
WARNING("NTFS inode %"PRIu64" has Win32 name with no "
"corresponding DOS name",
return 0;
}
-static void
-free_dos_name_tree(struct avl_tree_node *node) {
- if (node) {
- free_dos_name_tree(node->left);
- free_dos_name_tree(node->right);
- FREE(DOS_NAME_NODE(node));
- }
-}
-
static void
destroy_dos_name_map(struct dos_name_map *map)
{
- free_dos_name_tree(map->root);
+ struct dos_name_node *node;
+ avl_tree_for_each_in_postorder(node, map->root,
+ struct dos_name_node, index_node)
+ FREE(node);
}
struct readdir_ctx {
struct wim_dentry *parent;
char *path;
size_t path_len;
- struct dos_name_map *dos_name_map;
- ntfs_volume *vol;
+ struct dos_name_map dos_name_map;
+ struct ntfs_volume_wrapper *volume;
struct capture_params *params;
int ret;
};
static int
-build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
- ntfs_inode *ni,
- char *path,
- size_t path_len,
- int name_type,
- ntfs_volume *ntfs_vol,
- struct capture_params *params);
+ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_p,
+ const MFT_REF mref,
+ char *path,
+ size_t path_len,
+ int name_type,
+ struct ntfs_volume_wrapper *volume,
+ struct capture_params *params);
static int
-wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
- const int name_nchars, const int name_type,
- const s64 pos, const MFT_REF mref,
- const unsigned dt_type)
+filldir(void *_ctx, const ntfschar *name, const int name_nchars,
+ const int name_type, const s64 pos, const MFT_REF mref,
+ const unsigned dt_type)
{
- struct readdir_ctx *ctx;
- size_t mbs_name_nbytes;
+ struct readdir_ctx *ctx = _ctx;
+ const size_t name_nbytes = name_nchars * sizeof(ntfschar);
char *mbs_name;
+ size_t mbs_name_nbytes;
+ size_t path_len;
struct wim_dentry *child;
int ret;
- size_t path_len;
- size_t name_nbytes = name_nchars * sizeof(ntfschar);
- ctx = dirent;
if (name_type & FILE_NAME_DOS) {
/* If this is the entry for a DOS name, store it for later. */
- ret = insert_dos_name(ctx->dos_name_map, name,
- name_nbytes, mref & MFT_REF_MASK_CPU);
+ ret = insert_dos_name(&ctx->dos_name_map, name,
+ name_nbytes, MREF(mref));
/* Return now if an error occurred or if this is just a DOS name
* and not a Win32+DOS name. */
if (ret != 0 || name_type == FILE_NAME_DOS)
goto out;
}
- ret = utf16le_to_tstr(name, name_nbytes,
- &mbs_name, &mbs_name_nbytes);
- if (ret)
+
+ /* Ignore . and .. entries */
+ ret = 0;
+ if ((name_nchars == 1 && name[0] == cpu_to_le16('.')) ||
+ (name_nchars == 2 && name[0] == cpu_to_le16('.') &&
+ name[1] == cpu_to_le16('.')))
goto out;
- if (mbs_name[0] == '.' &&
- (mbs_name[1] == '\0' ||
- (mbs_name[1] == '.' && mbs_name[2] == '\0'))) {
- /* . or .. entries
- *
- * note: name_type is POSIX for these, so DOS names will not
- * have been inserted for them. */
- ret = 0;
- goto out_free_mbs_name;
- }
+ ret = utf16le_to_tstr(name, name_nbytes, &mbs_name, &mbs_name_nbytes);
+ if (ret)
+ goto out;
- /* Open the inode for this directory entry and recursively capture the
- * directory tree rooted at it */
- ntfs_inode *ni = ntfs_inode_open(ctx->vol, mref);
- if (!ni) {
- /* XXX This used to be treated as an error, but NTFS-3g seemed
- * to be unable to read some inodes on a Windows 8 image for
- * some reason. */
- WARNING_WITH_ERRNO("Failed to open NTFS file \"%s/%s\"",
- ctx->path, mbs_name);
- ret = 0;
- goto out_free_mbs_name;
- }
path_len = ctx->path_len;
if (path_len != 1)
ctx->path[path_len++] = '/';
memcpy(ctx->path + path_len, mbs_name, mbs_name_nbytes + 1);
path_len += mbs_name_nbytes;
child = NULL;
- ret = build_dentry_tree_ntfs_recursive(&child, ni, ctx->path,
- path_len, name_type,
- ctx->vol, ctx->params);
- path_len -= mbs_name_nbytes + 1;
+ ret = ntfs_3g_build_dentry_tree_recursive(&child, mref, ctx->path,
+ path_len, name_type,
+ ctx->volume, ctx->params);
if (child)
dentry_add_child(ctx->parent, child);
- ntfs_inode_close(ni);
-out_free_mbs_name:
FREE(mbs_name);
out:
- ctx->path[ctx->path_len] = '\0';
ctx->ret = ret;
return ret;
}
-/* Recursive scan routine for NTFS volumes */
static int
-build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret,
- ntfs_inode *ni,
- char *path,
- size_t path_len,
- int name_type,
- ntfs_volume *vol,
- struct capture_params *params)
+ntfs_3g_recurse_directory(ntfs_inode *ni, char *path, size_t path_len,
+ struct wim_dentry *parent,
+ struct ntfs_volume_wrapper *volume,
+ struct capture_params *params)
+{
+ int ret;
+ s64 pos = 0;
+ struct readdir_ctx ctx = {
+ .parent = parent,
+ .path = path,
+ .path_len = path_len,
+ .dos_name_map = { .root = NULL },
+ .volume = volume,
+ .params = params,
+ .ret = 0,
+ };
+ ret = ntfs_readdir(ni, &pos, &ctx, filldir);
+ path[path_len] = '\0';
+ if (unlikely(ret)) {
+ if (ctx.ret) {
+ /* wimlib error */
+ ret = ctx.ret;
+ } else {
+ /* error from ntfs_readdir() itself */
+ ERROR_WITH_ERRNO("Error reading directory \"%s\"", path);
+ ret = WIMLIB_ERR_NTFS_3G;
+ }
+ } else {
+ struct wim_dentry *child;
+
+ ret = 0;
+ for_dentry_child(child, parent) {
+ ret = set_dentry_dos_name(child, &ctx.dos_name_map);
+ if (ret)
+ break;
+ }
+ }
+ destroy_dos_name_map(&ctx.dos_name_map);
+ return ret;
+}
+
+static int
+ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
+ const MFT_REF mref,
+ char *path,
+ size_t path_len,
+ int name_type,
+ struct ntfs_volume_wrapper *volume,
+ struct capture_params *params)
{
u32 attributes;
int ret;
struct wim_dentry *root = NULL;
struct wim_inode *inode = NULL;
+ ntfs_inode *ni = NULL;
ret = try_exclude(path, path_len, params);
if (ret < 0) /* Excluded? */
if (ret > 0) /* Error? */
goto out;
+ ni = ntfs_inode_open(volume->vol, mref);
+ if (!ni) {
+ ERROR_WITH_ERRNO("Failed to open NTFS file \"%s\"", path);
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out;
+ }
+
/* Get file attributes */
ret = ntfs_get_ntfs_attrib(ni, (char*)&attributes, sizeof(attributes));
if (ret != sizeof(attributes)) {
goto out;
}
- if (attributes & FILE_ATTRIBUTE_ENCRYPTED) {
+ if (unlikely(attributes & FILE_ATTRIBUTE_ENCRYPTED)) {
if (params->add_flags & WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
{
ERROR("Can't archive \"%s\" because NTFS-3g capture mode "
goto out;
if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */
- root->is_win32_name = 1;
+ root->d_is_win32_name = 1;
inode = root->d_inode;
inode->i_attributes = attributes;
if (attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
- /* Load the reparse point stream. */
- ret = load_ntfs_attrs_with_type(inode, ni, path, path_len,
+ /* Scan the reparse point stream. */
+ ret = scan_ntfs_attrs_with_type(inode, ni, path, path_len,
params->unhashed_blobs,
- vol, AT_REPARSE_POINT);
+ volume, AT_REPARSE_POINT);
if (ret)
goto out;
}
- /* Load the data streams.
+ /* Scan the data streams.
*
* Note: directories should not have an unnamed data stream, but they
* may have named data streams. Nondirectories (including reparse
* points) can have an unnamed data stream as well as named data
* streams. */
- ret = load_ntfs_attrs_with_type(inode, ni, path, path_len,
- params->unhashed_blobs, vol, AT_DATA);
+ ret = scan_ntfs_attrs_with_type(inode, ni, path, path_len,
+ params->unhashed_blobs,
+ volume, AT_DATA);
if (ret)
goto out;
- if (inode_is_directory(inode)) {
-
- /* Recurse to directory children */
- s64 pos = 0;
- struct dos_name_map dos_name_map = { .root = NULL };
- struct readdir_ctx ctx = {
- .parent = root,
- .path = path,
- .path_len = path_len,
- .dos_name_map = &dos_name_map,
- .vol = vol,
- .params = params,
- .ret = 0,
- };
- ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir);
- if (ret) {
- if (ctx.ret) {
- /* wimlib error */
- ret = ctx.ret;
- } else {
- /* error from ntfs_readdir() itself */
- ERROR_WITH_ERRNO("Error reading directory \"%s\"", path);
- ret = WIMLIB_ERR_NTFS_3G;
- }
- } else {
- struct wim_dentry *child;
-
- ret = 0;
- for_dentry_child(child, root) {
- ret = set_dentry_dos_name(child, &dos_name_map);
- if (ret)
- break;
- }
- }
- destroy_dos_name_map(&dos_name_map);
- if (ret)
- goto out;
- }
- path[path_len] = '\0';
-
/* Reparse-point fixups are a no-op because in NTFS-3g capture mode we
* only allow capturing an entire volume. */
if (params->add_flags & WIMLIB_ADD_FLAG_RPFIX &&
inode_is_symlink(inode))
- inode->i_not_rpfixed = 0;
+ inode->i_rp_flags &= ~WIM_RP_FLAG_NOT_FIXED;
if (!(params->add_flags & WIMLIB_ADD_FLAG_NO_ACLS)) {
- struct SECURITY_CONTEXT sec_ctx;
- char _sd[4096];
- char *sd;
-
- /* Get security descriptor */
- memset(&sec_ctx, 0, sizeof(sec_ctx));
- sec_ctx.vol = vol;
-
- errno = 0;
- sd = _sd;
- ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, sizeof(_sd));
- if (ret > sizeof(_sd)) {
- sd = alloca(ret);
- ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, ret);
- }
- if (ret > 0) {
- 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;
- goto out;
- }
- DEBUG("Added security ID = %u for `%s'",
- 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 {
- inode->i_security_id = -1;
- DEBUG("No security ID for `%s'", path);
+ ret = get_security_descriptor(ni, inode, volume->vol,
+ params->sd_set);
+ if (ret) {
+ ERROR_WITH_ERRNO("Error reading security descriptor "
+ "of \"%s\"", path);
+ goto out;
}
}
- if (ret)
- goto out;
+
+ if (inode_is_directory(inode)) {
+ ret = ntfs_3g_recurse_directory(ni, path, path_len, root,
+ volume, params);
+ if (ret)
+ goto out;
+ }
out_progress:
params->progress.scan.cur_path = path;
else
ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
out:
+ if (ni)
+ ntfs_inode_close(ni);
if (unlikely(ret)) {
free_dentry_tree(root, params->blob_table);
root = NULL;
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 capture_params *params)
+ntfs_3g_build_dentry_tree(struct wim_dentry **root_ret,
+ const char *device,
+ struct capture_params *params)
{
+ struct ntfs_volume_wrapper *volume;
ntfs_volume *vol;
- ntfs_inode *root_ni;
+ char *path;
int ret;
- DEBUG("Mounting NTFS volume `%s' read-only", device);
+ volume = MALLOC(sizeof(struct ntfs_volume_wrapper));
+ if (!volume)
+ return WIMLIB_ERR_NOMEM;
-/* NTFS-3g 2013 renamed the "read-only" mount flag from MS_RDONLY to
- * NTFS_MNT_RDONLY.
- *
- * Unfortunately we can't check for defined(NTFS_MNT_RDONLY) because
- * NTFS_MNT_RDONLY is an enumerated constant. Also, the NTFS-3g headers don't
- * seem to contain any explicit version information. So we have to rely on a
- * test done at configure time to detect whether NTFS_MNT_RDONLY should be used.
- * */
+ /* NTFS-3g 2013 renamed the "read-only" mount flag from MS_RDONLY to
+ * NTFS_MNT_RDONLY.
+ *
+ * Unfortunately we can't check for defined(NTFS_MNT_RDONLY) because
+ * NTFS_MNT_RDONLY is an enumerated constant. Also, the NTFS-3g headers
+ * don't seem to contain any explicit version information. So we have
+ * to rely on a test done at configure time to detect whether
+ * NTFS_MNT_RDONLY should be used. */
#ifdef HAVE_NTFS_MNT_RDONLY
/* NTFS-3g 2013 */
vol = ntfs_mount(device, NTFS_MNT_RDONLY);
#error "Can't find NTFS_MNT_RDONLY or MS_RDONLY flags"
#endif
if (!vol) {
- ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s' read-only",
+ ERROR_WITH_ERRNO("Failed to mount NTFS volume \"%s\" read-only",
device);
+ FREE(volume);
return WIMLIB_ERR_NTFS_3G;
}
+
+ volume->vol = vol;
+ volume->refcnt = 1;
+
ntfs_open_secure(vol);
/* We don't want to capture the special NTFS files such as $Bitmap. Not
* that we do need to capture. */
NVolClearShowSysFiles(vol);
- DEBUG("Opening root NTFS dentry");
- root_ni = ntfs_inode_open(vol, FILE_root);
- if (!root_ni) {
- ERROR_WITH_ERRNO("Failed to open root inode of NTFS volume "
- "`%s'", device);
- ret = WIMLIB_ERR_NTFS_3G;
- goto out;
- }
-
/* Currently we assume that all the paths fit into this length and there
- * is no check for overflow. */
- char *path = MALLOC(32768);
+ * is no check for overflow. */
+ path = MALLOC(32768);
if (!path) {
- ERROR("Could not allocate memory for NTFS pathname");
ret = WIMLIB_ERR_NOMEM;
- goto out_cleanup;
+ goto out_put_ntfs_volume;
}
path[0] = '/';
path[1] = '\0';
- ret = build_dentry_tree_ntfs_recursive(root_p, root_ni, path, 1,
- FILE_NAME_POSIX, vol, params);
-out_cleanup:
+ ret = ntfs_3g_build_dentry_tree_recursive(root_ret, FILE_root, path, 1,
+ FILE_NAME_POSIX, volume,
+ params);
FREE(path);
- ntfs_inode_close(root_ni);
-out:
+out_put_ntfs_volume:
ntfs_index_ctx_put(vol->secure_xsii);
ntfs_index_ctx_put(vol->secure_xsdh);
ntfs_inode_close(vol->secure_ni);
-
- if (ret) {
- if (do_ntfs_umount(vol)) {
- ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'",
- device);
- }
- } 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**)params->extra_arg = vol;
- }
+ put_ntfs_volume(volume);
return ret;
}
#endif /* WITH_NTFS_3G */
git://wimlib.net / wimlib / blobdiff