struct reparse_buffer_disk rpbuf;
u8 *reparse_ptr;
- /* Offset in the blob currently being read */
- u64 offset;
-
unsigned num_reparse_inodes;
ntfs_inode *ntfs_reparse_inodes[MAX_OPEN_FILES];
struct wim_inode *wim_reparse_inodes[MAX_OPEN_FILES];
ret = -1;
}
utf16le_put_tstr(dos_name);
- if (ret) {
+ if (unlikely(ret)) {
+ int err = errno;
ERROR_WITH_ERRNO("Failed to set DOS name of \"%s\" in NTFS "
"volume", dentry_full_path(dentry));
+ if (err == EILSEQ) {
+ ERROR("This error may have been caused by a known "
+ "bug in libntfs-3g where it is unable to set "
+ "DOS names on files whose long names contain "
+ "unpaired surrogate characters. This bug "
+ "was fixed in the development version of "
+ "NTFS-3G in June 2016.");
+ }
+ if (err == EINVAL) {
+ utf16lechar c =
+ dentry->d_name[dentry->d_name_nbytes / 2 - 1];
+ if (c == cpu_to_le16('.') || c == cpu_to_le16(' ')) {
+ ERROR("This error was probably caused by a "
+ "known bug in libntfs-3g where it is "
+ "unable to set DOS names on files whose "
+ "long names end with a dot or space "
+ "character. See "
+ "https://wimlib.net/forums/viewtopic.php?f=1&t=294 "
+ "for more information.");
+ }
+ }
ret = WIMLIB_ERR_SET_SHORT_NAME;
goto out_close;
}
}
ctx->num_open_inodes = 0;
- ctx->offset = 0;
ctx->reparse_ptr = NULL;
ctx->num_reparse_inodes = 0;
return ret;
return ret;
}
-/* Note: contrary to its documentation, ntfs_attr_pwrite() can return a short
- * count in non-error cases --- specifically, when writing to a compressed
- * attribute and the requested count exceeds the size of an NTFS "compression
- * block". Therefore, we must continue calling ntfs_attr_pwrite() until all
- * bytes have been written or a real error has occurred. */
+/*
+ * Note: prior to NTFS-3G version 2016.2.22, ntfs_attr_pwrite() could return a
+ * short count in non-error cases, contrary to its documentation. Specifically,
+ * a short count could be returned when writing to a compressed attribute and
+ * the requested count exceeded the size of an NTFS "compression block".
+ * Therefore, we must continue calling ntfs_attr_pwrite() until all bytes have
+ * been written or a real error has occurred.
+ */
static bool
ntfs_3g_full_pwrite(ntfs_attr *na, u64 offset, size_t size, const u8 *data)
{
}
static int
-ntfs_3g_extract_chunk(const void *chunk, size_t size, void *_ctx)
+ntfs_3g_extract_chunk(const struct blob_descriptor *blob, u64 offset,
+ const void *chunk, size_t size, void *_ctx)
{
struct ntfs_3g_apply_ctx *ctx = _ctx;
for (unsigned i = 0; i < ctx->num_open_attrs; i++) {
- if (!ntfs_3g_full_pwrite(ctx->open_attrs[i],
- ctx->offset, size, chunk))
+ if (!ntfs_3g_full_pwrite(ctx->open_attrs[i], offset,
+ size, chunk))
{
ERROR_WITH_ERRNO("Error writing data to NTFS volume");
return WIMLIB_ERR_NTFS_3G;
}
if (ctx->reparse_ptr)
ctx->reparse_ptr = mempcpy(ctx->reparse_ptr, chunk, size);
- ctx->offset += size;
return 0;
}
}
ctx->vol = vol;
+ /* Opening $Secure is required to set security descriptors in NTFS v3.0
+ * format, where security descriptors are stored in a per-volume index
+ * rather than being fully specified for each file. */
+ if (ntfs_open_secure(vol) && vol->major_ver >= 3) {
+ ERROR_WITH_ERRNO("Unable to open security descriptor index of "
+ "NTFS volume \"%s\"", ctx->common.target);
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out_unmount;
+ }
+
/* Create all inodes and aliases, including short names, and set
* metadata (attributes, security descriptors, and timestamps). */
/* Extract blobs. */
struct read_blob_callbacks cbs = {
.begin_blob = ntfs_3g_begin_extract_blob,
- .consume_chunk = ntfs_3g_extract_chunk,
+ .continue_blob = ntfs_3g_extract_chunk,
.end_blob = ntfs_3g_end_extract_blob,
.ctx = ctx,
};
* ntfs_set_ntfs_dos_name() does, but we handle this elsewhere). */
out_unmount:
+ if (vol->secure_ni) {
+ ntfs_index_ctx_put(vol->secure_xsii);
+ ntfs_index_ctx_put(vol->secure_xsdh);
+ if (ntfs_inode_close(vol->secure_ni) && !ret) {
+ ERROR_WITH_ERRNO("Failed to close security descriptor "
+ "index of NTFS volume \"%s\"",
+ ctx->common.target);
+ ret = WIMLIB_ERR_NTFS_3G;
+ }
+ vol->secure_ni = NULL;
+ }
if (ntfs_umount(ctx->vol, FALSE) && !ret) {
ERROR_WITH_ERRNO("Failed to unmount \"%s\" with NTFS-3G",
ctx->common.target);