}
/* Security descriptor */
- if ((inode->i_security_id >= 0)
+ if (inode_has_security_descriptor(inode)
&& !(extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS))
{
const void *desc;
return WIMLIB_ERR_INVALID_REPARSE_DATA;
}
ctx->reparse_ptr = ctx->rpbuf.rpdata;
- ctx->rpbuf.rpdatalen = cpu_to_le16(blob->size);
- ctx->rpbuf.rpreserved = cpu_to_le16(0);
ctx->ntfs_reparse_inodes[ctx->num_reparse_inodes] = ni;
ctx->wim_reparse_inodes[ctx->num_reparse_inodes] = inode;
ctx->num_reparse_inodes++;
for (u32 i = 0; i < ctx->num_reparse_inodes; i++) {
struct wim_inode *inode = ctx->wim_reparse_inodes[i];
- ctx->rpbuf.rptag = cpu_to_le32(inode->i_reparse_tag);
+ complete_reparse_point(&ctx->rpbuf, inode, blob->size);
if (ntfs_set_ntfs_reparse_data(ctx->ntfs_reparse_inodes[i],
(const char *)&ctx->rpbuf,
- blob->size + REPARSE_DATA_OFFSET,
+ REPARSE_DATA_OFFSET + blob->size,
0))
{
ERROR_WITH_ERRNO("Failed to set reparse "
return ret;
}
-static uint64_t
+static u64
ntfs_3g_count_dentries(const struct list_head *dentry_list)
{
const struct wim_dentry *dentry;
- uint64_t count = 0;
+ u64 count = 0;
list_for_each_entry(dentry, dentry_list, d_extraction_list_node) {
count++;
goto out_unmount;
/* Extract blobs. */
- struct read_blob_list_callbacks cbs = {
- .begin_blob = ntfs_3g_begin_extract_blob,
- .begin_blob_ctx = ctx,
- .consume_chunk = ntfs_3g_extract_chunk,
- .consume_chunk_ctx = ctx,
- .end_blob = ntfs_3g_end_extract_blob,
- .end_blob_ctx = ctx,
+ struct read_blob_callbacks cbs = {
+ .begin_blob = ntfs_3g_begin_extract_blob,
+ .consume_chunk = ntfs_3g_extract_chunk,
+ .end_blob = ntfs_3g_end_extract_blob,
+ .ctx = ctx,
};
ret = extract_blob_list(&ctx->common, &cbs);