* 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"
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:
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;
}
goto out_put_actx;
}
ntfs_loc->ntfs_vol = vol;
- ntfs_loc->path = MALLOC(path_len + 1);
+ ntfs_loc->path = memdup(path, path_len + 1);
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);
+ ntfs_loc->stream_name = memdup(attr_record_name(actx->attr),
+ name_length * 2);
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);
ntfs_loc->stream_name_nchars = name_length;
}
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;
}
/* 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) {
+ ERROR("Found two un-named data streams for \"%s\" "
+ "(sizes = %"PRIu64", %"PRIu64")",
+ path, wim_resource_size(inode->i_lte),
+ wim_resource_size(lte));
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out_free_lte;
+ }
+ } 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 */
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);
+ 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;
}
struct rb_node rb_node;
char dos_name[24];
int name_nbytes;
- u64 ntfs_ino;
+ le64 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;
* 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);
+ le64_to_cpu(ntfs_ino));
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;
}
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;
}
*/
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_dentry *root = NULL;
struct wim_inode *inode;
ATTR_TYPES stream_type;
+ params->progress.scan.cur_path = path;
+
if (exclude_path(path, path_len, params->config, false)) {
/* 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;
+ do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED);
ret = 0;
goto out;
}
/* 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;
+ }
+ do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED);
+ ret = 0;
+ goto out;
}
+ do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK);
+
/* Create a WIM dentry with an associated inode, which may be shared */
ret = inode_table_new_dentry(¶ms->inode_table,
path_basename_with_len(path, path_len),
ni->mft_no, 0, false, &root);
if (ret)
- return ret;
+ 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 */
+ if (inode->i_nlink > 1) {
+ /* Shared inode; nothing more to do */
+ ret = 0;
goto out;
+ }
- 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_last_access_time = le64_to_cpu(ni->last_access_time);
struct dos_name_map dos_name_map = { .rb_root = {.rb_node = 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,
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,
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