/*
* ntfs-3g_capture.c
*
- * Capture a WIM image directly from a NTFS volume using libntfs-3g. We capture
+ * Capture a WIM image directly from an NTFS volume using libntfs-3g. We capture
* everything we can, including security data and alternate data streams.
*/
/*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012, 2013, 2014 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef WITH_NTFS_3G
+#include <errno.h>
+#include <stdlib.h>
+
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
-
#endif
-#include <errno.h>
-#include <stdlib.h>
-#include <time.h> /* NTFS-3g headers are missing <time.h> include */
-#include <unistd.h>
#include <ntfs-3g/attrib.h>
-#include <ntfs-3g/endians.h>
-#include <ntfs-3g/layout.h>
-#include <ntfs-3g/misc.h>
#include <ntfs-3g/reparse.h>
-#include <ntfs-3g/security.h> /* ntfs-3g/security.h before ntfs-3g/xattrs.h */
-#include <ntfs-3g/types.h>
+#include <ntfs-3g/security.h>
#include <ntfs-3g/volume.h>
-#include <ntfs-3g/xattrs.h>
-#include <ntfs-3g/acls.h> /* This should be included last as it requires
- definitions from above not included by itself */
-
-#include "wimlib/buffer_io.h"
#include "wimlib/capture.h"
#include "wimlib/dentry.h"
#include "wimlib/encoding.h"
+#include "wimlib/endianness.h"
#include "wimlib/error.h"
#include "wimlib/lookup_table.h"
#include "wimlib/ntfs_3g.h"
}
int
-read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte,
- u64 size,
- consume_data_callback_t cb,
- void *ctx_or_buf,
- int _ignored_flags)
+read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, u64 size,
+ consume_data_callback_t cb, void *cb_ctx)
{
struct ntfs_location *loc = lte->ntfs_loc;
ntfs_volume *vol = loc->ntfs_vol;
ntfs_attr *na;
s64 pos;
s64 bytes_remaining;
- void *out_buf;
int ret;
+ u8 buf[BUFFER_SIZE];
- ni = ntfs_pathname_to_inode(vol, NULL, loc->path);
+ ni = ntfs_pathname_to_inode(vol, NULL, loc->path);
if (!ni) {
ERROR_WITH_ERRNO("Can't find NTFS inode for \"%"TS"\"", loc->path);
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_ntfs_inode;
}
- if (cb)
- out_buf = alloca(WIM_CHUNK_SIZE);
- else
- out_buf = ctx_or_buf;
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) {
+ 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);
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_ntfs_attr;
}
pos += to_read;
bytes_remaining -= to_read;
- if (cb) {
- ret = cb(out_buf, to_read, ctx_or_buf);
- if (ret)
- goto out_close_ntfs_attr;
- } else {
- out_buf += to_read;
- }
+ ret = cb(buf, to_read, cb_ctx);
+ if (ret)
+ goto out_close_ntfs_attr;
}
ret = 0;
out_close_ntfs_attr:
u32 *reparse_tag_ret)
{
int ret;
- u8 buf[8];
+ le32 reparse_tag;
ntfs_attr *na;
na = open_ntfs_attr(ni, loc);
goto out;
}
- if (ntfs_attr_pread(na, 0, 8, buf) != 8) {
+ if (ntfs_attr_pread(na, 0, sizeof(reparse_tag),
+ &reparse_tag) != sizeof(reparse_tag))
+ {
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);
+ *reparse_tag_ret = le32_to_cpu(reparse_tag);
DEBUG("ReparseTag = %#x", *reparse_tag_ret);
ret = 0;
out_close_ntfs_attr:
}
-/* Load the streams from a file or reparse point in the NTFS volume into the WIM
- * lookup table */
+/* Load the streams from a file or reparse point in the NTFS volume */
static int
capture_ntfs_streams(struct wim_inode *inode,
ntfs_inode *ni,
char *path,
size_t path_len,
- struct wim_lookup_table *lookup_table,
+ struct list_head *unhashed_streams,
ntfs_volume *vol,
ATTR_TYPES type)
{
int ret;
struct wim_lookup_table_entry *lte;
- DEBUG2("Capturing NTFS data streams from `%s'", path);
+ DEBUG("Capturing NTFS data streams from `%s'", path);
/* Get context to search the streams of the NTFS file. */
actx = ntfs_attr_get_search_ctx(ni, NULL);
if (!actx) {
ERROR_WITH_ERRNO("Cannot get NTFS attribute search "
- "context");
+ "context for \"%s\"", path);
return WIMLIB_ERR_NTFS_3G;
}
ntfs_loc = NULL;
if (type == AT_REPARSE_POINT) {
if (data_size < 8) {
- ERROR("Invalid reparse data (only %u bytes)!",
- (unsigned)data_size);
+ ERROR("Invalid reparse data on \"%s\" "
+ "(only %u bytes)!", path, (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->size = data_size - 8;
ret = read_reparse_tag(ni, lte->ntfs_loc,
&inode->i_reparse_tag);
if (ret)
goto out_free_lte;
} else {
lte->ntfs_loc->is_reparse_point = false;
- lte->resource_entry.original_size = data_size;
+ lte->size = data_size;
}
}
if (name_length == 0) {
/* Unnamed data stream. Put the reference to it in the
* dentry's inode. */
if (inode->i_lte) {
- ERROR("Found two un-named data streams for `%s'",
- path);
- ret = WIMLIB_ERR_NTFS_3G;
- goto out_free_lte;
+ if (lte) {
+ if (!(inode->i_attributes &
+ FILE_ATTRIBUTE_REPARSE_POINT))
+ {
+ WARNING("Found two un-named "
+ "data streams for \"%s\" "
+ "(sizes = %"PRIu64", "
+ "%"PRIu64")",
+ path,
+ inode->i_lte->size,
+ lte->size);
+ }
+ free_lookup_table_entry(lte);
+ continue;
+ }
+ } else {
+ stream_id = 0;
+ inode->i_lte = lte;
}
- stream_id = 0;
- inode->i_lte = lte;
} else {
/* Named data stream. Put the reference to it in the
* alternate data stream entries */
new_ads_entry->lte = lte;
}
if (lte) {
- lookup_table_insert_unhashed(lookup_table, lte,
- inode, stream_id);
+ add_unhashed_stream(lte, inode,
+ stream_id, unhashed_streams);
}
}
if (errno == ENOENT) {
ret = 0;
} else {
- ERROR_WITH_ERRNO("Error listing NTFS attributes from `%s'",
- path);
+ ERROR_WITH_ERRNO("Error listing NTFS attributes of \"%s\"", path);
ret = WIMLIB_ERR_NTFS_3G;
}
goto out_put_actx;
out_put_actx:
ntfs_attr_put_search_ctx(actx);
if (ret == 0)
- DEBUG2("Successfully captured NTFS streams from `%s'", path);
+ DEBUG("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;
}
-/* Red-black tree that maps NTFS inode numbers to DOS names */
+/* Binary tree that maps NTFS inode numbers to DOS names */
struct dos_name_map {
- struct rb_root rb_root;
+ struct avl_tree_node *root;
};
struct dos_name_node {
- struct rb_node rb_node;
+ struct avl_tree_node index_node;
char dos_name[24];
int name_nbytes;
- u64 ntfs_ino;
+ le64 ntfs_ino;
};
+#define DOS_NAME_NODE(avl_node) \
+ avl_tree_entry(avl_node, struct dos_name_node, index_node)
+
+static int
+_avl_cmp_by_ntfs_ino(const struct avl_tree_node *n1,
+ const struct avl_tree_node *n2)
+{
+ return cmp_u64(DOS_NAME_NODE(n1)->ntfs_ino,
+ DOS_NAME_NODE(n2)->ntfs_ino);
+}
+
/* 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, u64 ntfs_ino)
+ size_t name_nbytes, le64 ntfs_ino)
{
struct dos_name_node *new_node;
- struct rb_node **p;
- struct rb_root *root;
- struct rb_node *rb_parent;
DEBUG("DOS name_len = %zu", name_nbytes);
new_node = MALLOC(sizeof(struct dos_name_node));
wimlib_assert(name_nbytes <= sizeof(new_node->dos_name));
/* Initialize the DOS name, DOS name length, and NTFS inode number of
- * the red-black tree node */
+ * the search tree node */
memcpy(new_node->dos_name, dos_name, name_nbytes);
new_node->name_nbytes = name_nbytes;
new_node->ntfs_ino = ntfs_ino;
- /* Insert the red-black tree node */
- root = &map->rb_root;
- p = &root->rb_node;
- rb_parent = NULL;
- while (*p) {
- struct dos_name_node *this;
-
- this = container_of(*p, struct dos_name_node, rb_node);
- rb_parent = *p;
- if (new_node->ntfs_ino < this->ntfs_ino)
- p = &((*p)->rb_left);
- else if (new_node->ntfs_ino > this->ntfs_ino)
- p = &((*p)->rb_right);
- else {
- /* This should be impossible since a 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",
- ntfs_ino);
- return -1;
- }
+ /* Insert the search tree node */
+ 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));
+ FREE(new_node);
+ return -1;
}
- rb_link_node(&new_node->rb_node, rb_parent, p);
- rb_insert_color(&new_node->rb_node, root);
- DEBUG("Inserted DOS name for inode %"PRIu64, ntfs_ino);
+ DEBUG("Inserted DOS name for inode %"PRIu64, le64_to_cpu(ntfs_ino));
return 0;
}
-/* Returns a structure that contains the DOS name and its length for a NTFS
+/* Returns a structure that contains the DOS name and its length for an NTFS
* inode, or NULL if the inode has no DOS name. */
static struct dos_name_node *
lookup_dos_name(const struct dos_name_map *map, u64 ntfs_ino)
{
- struct rb_node *node = map->rb_root.rb_node;
- while (node) {
- struct dos_name_node *this;
- this = container_of(node, struct dos_name_node, rb_node);
- if (ntfs_ino < this->ntfs_ino)
- node = node->rb_left;
- else if (ntfs_ino > this->ntfs_ino)
- node = node->rb_right;
- else
- return this;
- }
- return NULL;
+ struct dos_name_node dummy;
+ struct avl_tree_node *res;
+
+ dummy.ntfs_ino = cpu_to_le64(ntfs_ino);
+
+ res = avl_tree_lookup_node(map->root, &dummy.index_node,
+ _avl_cmp_by_ntfs_ino);
+ if (!res)
+ return NULL;
+ return DOS_NAME_NODE(res);
}
static int
-set_dentry_dos_name(struct wim_dentry *dentry, void *arg)
+set_dentry_dos_name(struct wim_dentry *dentry, const struct dos_name_map *map)
{
- const struct dos_name_map *map = arg;
const struct dos_name_node *node;
if (dentry->is_win32_name) {
node = lookup_dos_name(map, dentry->d_inode->i_ino);
if (node) {
- dentry->short_name = MALLOC(node->name_nbytes + 2);
+ dentry->short_name = utf16le_dupz((const utf16lechar *)node->dos_name,
+ node->name_nbytes);
if (!dentry->short_name)
return WIMLIB_ERR_NOMEM;
- memcpy(dentry->short_name, node->dos_name,
- node->name_nbytes);
- dentry->short_name[node->name_nbytes / 2] = 0;
dentry->short_name_nbytes = node->name_nbytes;
DEBUG("Assigned DOS name to ino %"PRIu64,
dentry->d_inode->i_ino);
}
static void
-free_dos_name_tree(struct rb_node *node) {
+free_dos_name_tree(struct avl_tree_node *node) {
if (node) {
- free_dos_name_tree(node->rb_left);
- free_dos_name_tree(node->rb_right);
- FREE(container_of(node, struct dos_name_node, rb_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->rb_root.rb_node);
+ free_dos_name_tree(map->root);
}
struct readdir_ctx {
struct wim_dentry *parent;
- ntfs_inode *dir_ni;
char *path;
size_t path_len;
struct dos_name_map *dos_name_map;
static int
build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
- ntfs_inode *dir_ni,
ntfs_inode *ni,
char *path,
size_t path_len,
/* Open the inode for this directory entry and recursively capture the
* directory tree rooted at it */
- ntfs_inode *ni = ntfs_inode_open(ctx->dir_ni->vol, mref);
+ ntfs_inode *ni = ntfs_inode_open(ctx->vol, mref);
if (!ni) {
- ERROR_WITH_ERRNO("Failed to open NTFS inode");
- ret = -1;
+ /* 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;
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, ctx->dir_ni,
- ni, ctx->path, path_len, name_type,
+ ret = build_dentry_tree_ntfs_recursive(&child, ni, ctx->path,
+ path_len, name_type,
ctx->vol, ctx->params);
+ path_len -= mbs_name_nbytes + 1;
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';
return ret;
}
-/* Recursively build a WIM dentry tree corresponding to a NTFS volume.
+/* Recursively build a WIM dentry tree corresponding to an NTFS volume.
* 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_recursive(struct wim_dentry **root_ret,
- ntfs_inode *dir_ni,
ntfs_inode *ni,
char *path,
size_t path_len,
ntfs_volume *vol,
struct add_image_params *params)
{
- u32 attributes;
+ le32 attributes;
int ret;
- struct wim_dentry *root;
- struct wim_inode *inode;
- ATTR_TYPES stream_type;
+ struct wim_dentry *root = NULL;
+ struct wim_inode *inode = NULL;
- if (exclude_path(path, path_len, params->config, false)) {
+ if (should_exclude_path(path, path_len, params->config)) {
/* Exclude a file or directory tree based on the capture
- * configuration file */
- if ((params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE)
- && params->progress_func)
- {
- union wimlib_progress_info info;
- info.scan.cur_path = path;
- info.scan.excluded = true;
- params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
- }
- root = NULL;
- ret = 0;
- goto out;
+ * configuration file. */
+ goto out_progress;
}
/* Get file attributes */
- struct SECURITY_CONTEXT ctx;
- memset(&ctx, 0, sizeof(ctx));
- ctx.vol = vol;
- ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ATTRIB,
- ni, dir_ni, (char *)&attributes,
- sizeof(u32));
- if (ret != 4) {
- ERROR_WITH_ERRNO("Failed to get NTFS attributes from `%s'",
- path);
- return WIMLIB_ERR_NTFS_3G;
+ ret = ntfs_get_ntfs_attrib(ni, (char*)&attributes, sizeof(attributes));
+ if (ret != sizeof(attributes)) {
+ ERROR_WITH_ERRNO("Failed to get NTFS attributes from \"%s\"", path);
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out;
}
- if ((params->add_flags & WIMLIB_ADD_FLAG_VERBOSE)
- && params->progress_func)
+ if ((attributes & (FILE_ATTRIBUTE_DIRECTORY |
+ FILE_ATTRIBUTE_ENCRYPTED)) == FILE_ATTRIBUTE_ENCRYPTED)
{
- union wimlib_progress_info info;
- info.scan.cur_path = path;
- info.scan.excluded = false;
- params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+ if (params->add_flags & WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
+ {
+ ERROR("Can't archive unsupported encrypted file \"%s\"", path);
+ ret = WIMLIB_ERR_UNSUPPORTED_FILE;
+ goto out;
+ }
+ params->progress.scan.cur_path = path;
+ ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
+ goto out;
}
/* Create a WIM dentry with an associated inode, which may be shared */
- ret = inode_table_new_dentry(¶ms->inode_table,
+ ret = inode_table_new_dentry(params->inode_table,
path_basename_with_len(path, path_len),
ni->mft_no, 0, false, &root);
if (ret)
- return ret;
-
- inode = root->d_inode;
-
- if (inode->i_nlink > 1) /* Shared inode; nothing more to do */
goto out;
if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */
root->is_win32_name = 1;
+
+ inode = root->d_inode;
+
+ if (inode->i_nlink > 1) {
+ /* Shared inode; nothing more to do */
+ goto out_progress;
+ }
+
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_last_access_time = le64_to_cpu(ni->last_access_time);
inode->i_attributes = le32_to_cpu(attributes);
inode->i_resolved = 1;
- if (attributes & FILE_ATTR_REPARSE_POINT)
- stream_type = AT_REPARSE_POINT;
- else
- stream_type = AT_DATA;
+ /* Capture streams. */
- /* Capture the file's streams; more specifically, this is supposed to:
+ if (attributes & FILE_ATTR_REPARSE_POINT) {
+ /* Capture reparse data stream. */
+ ret = capture_ntfs_streams(inode, ni, path, path_len,
+ params->unhashed_streams,
+ vol, AT_REPARSE_POINT);
+ if (ret)
+ goto out;
+ }
+
+ /* Capture data streams.
+ *
+ * Directories should not have an unnamed data stream, but they may have
+ * named data streams.
*
- * - Regular files: capture unnamed data stream and any named data
- * streams
- * - Directories: capture any named data streams
- * - Reparse points: capture reparse data only
- */
+ * Reparse points may have an unnamed data stream (which will be ignored
+ * in favor of the reparse data stream), and they also may have named
+ * data streams.
+ *
+ * Regular files can have an unnamed data stream as well as named data
+ * streams. */
ret = capture_ntfs_streams(inode, ni, path, path_len,
- params->lookup_table, vol, stream_type);
+ params->unhashed_streams, vol, AT_DATA);
if (ret)
goto out;
/* Recurse to directory children */
s64 pos = 0;
- struct dos_name_map dos_name_map = { .rb_root = {.rb_node = NULL} };
+ struct dos_name_map dos_name_map = { .root = NULL };
struct readdir_ctx ctx = {
.parent = root,
- .dir_ni = ni,
.path = path,
.path_len = path_len,
.dos_name_map = &dos_name_map,
};
ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir);
if (ret) {
- ERROR_WITH_ERRNO("ntfs_readdir()");
+ ERROR_WITH_ERRNO("Error reading directory \"%s\"", path);
ret = WIMLIB_ERR_NTFS_3G;
} else {
- ret = for_dentry_child(root, set_dentry_dos_name,
- &dos_name_map);
+ 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. */
inode->i_not_rpfixed = 0;
if (!(params->add_flags & WIMLIB_ADD_FLAG_NO_ACLS)) {
+ struct SECURITY_CONTEXT sec_ctx;
+ char _sd[4096];
+ char *sd;
+
/* Get security descriptor */
- char _sd[1];
- char *sd = _sd;
+ memset(&sec_ctx, 0, sizeof(sec_ctx));
+ sec_ctx.vol = vol;
+
errno = 0;
- ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
- ni, dir_ni, sd,
- sizeof(sd));
- if (ret > sizeof(sd)) {
+ sd = _sd;
+ ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, sizeof(_sd));
+ if (ret > sizeof(_sd)) {
sd = alloca(ret);
- ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
- ni, dir_ni, sd, ret);
+ ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, ret);
}
if (ret > 0) {
- inode->i_security_id = sd_set_add_sd(¶ms->sd_set,
+ inode->i_security_id = sd_set_add_sd(params->sd_set,
sd, ret);
if (inode->i_security_id == -1) {
ERROR("Out of memory");
DEBUG("No security ID for `%s'", path);
}
}
+ if (ret)
+ goto out;
+
+out_progress:
+ params->progress.scan.cur_path = path;
+ if (root == NULL)
+ ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
+ else
+ ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
out:
if (ret == 0)
*root_ret = root;
DEBUG("Mounting NTFS volume `%s' read-only", device);
-#if defined(NTFS_MNT_RDONLY)
+/* 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);
#elif defined(MS_RDONLY)
/* NTFS-3g 2011, 2012 */
vol = ntfs_mount(device, MS_RDONLY);
+#else
+ #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",
path[0] = '/';
path[1] = '\0';
- ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1,
+ ret = build_dentry_tree_ntfs_recursive(root_p, root_ni, path, 1,
FILE_NAME_POSIX, vol, params);
out_cleanup:
FREE(path);
git://wimlib.net / wimlib / blobdiff