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;
}
/* 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;
}
* directory tree rooted at it */
ntfs_inode *ni = ntfs_inode_open(ctx->dir_ni->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;
ret = build_dentry_tree_ntfs_recursive(&child, ctx->dir_ni,
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;
}
ni, dir_ni, (char *)&attributes,
sizeof(attributes));
if (ret != sizeof(attributes)) {
- ERROR_WITH_ERRNO("Failed to get NTFS attributes from `%s'",
- path);
+ ERROR_WITH_ERRNO("Failed to get NTFS attributes from \"%s\"", path);
return WIMLIB_ERR_NTFS_3G;
}
};
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,
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",