WIMStruct *w;
};
-
-#if 0
-extern int ntfs_set_inode_security(ntfs_inode *ni, u32 selection,
- const char *attr);
-extern int ntfs_set_inode_attributes(ntfs_inode *ni, u32 attrib);
-#endif
-
-/*
+/*
* Extracts a WIM resource to a NTFS attribute.
*/
static int
while (bytes_remaining) {
u64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE);
- ret = read_wim_resource(lte, buf, to_read, offset, false);
+ ret = read_wim_resource(lte, buf, to_read, offset, 0);
if (ret != 0)
break;
sha1_update(&ctx, buf, to_read);
/* Writes the data streams to a NTFS file
*
* @ni: The NTFS inode for the file.
- * @dentry: The directory entry in the WIM file.
+ * @inode: The WIM dentry that has an inode containing the streams.
* @w: The WIMStruct for the WIM containing the image we are applying.
*
* Returns 0 on success, nonzero on failure.
unsigned stream_idx = 0;
ntfschar *stream_name = AT_UNNAMED;
u32 stream_name_len = 0;
+ const struct inode *inode = dentry->d_inode;
DEBUG("Writing %u NTFS data stream%s for `%s'",
- dentry->num_ads + 1,
- (dentry->num_ads == 0 ? "" : "s"),
+ inode->num_ads + 1,
+ (inode->num_ads == 0 ? "" : "s"),
dentry->full_path_utf8);
while (1) {
struct lookup_table_entry *lte;
ntfs_attr *na;
- lte = dentry_stream_lte(dentry, stream_idx, w->lookup_table);
+ lte = inode_stream_lte(inode, stream_idx, w->lookup_table);
if (stream_name_len) {
/* Create an empty named stream. */
break;
ntfs_attr_close(na);
}
- if (stream_idx == dentry->num_ads)
+ if (stream_idx == inode->num_ads)
break;
- stream_name = (ntfschar*)dentry->ads_entries[stream_idx].stream_name;
- stream_name_len = dentry->ads_entries[stream_idx].stream_name_len / 2;
+ stream_name = (ntfschar*)inode->ads_entries[stream_idx].stream_name;
+ stream_name_len = inode->ads_entries[stream_idx].stream_name_len / 2;
stream_idx++;
}
return ret;
*
* It is named @from_dentry->file_name and is located under the directory
* specified by @dir_ni, and it is made to point to the previously extracted
- * file located at @to_dentry->extracted_file.
+ * file located at @inode->extracted_file.
*
* Return 0 on success, nonzero on failure.
*/
static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry,
- const struct dentry *to_dentry,
+ const struct inode *inode,
ntfs_inode *dir_ni,
ntfs_inode **to_ni_ret)
{
ntfs_volume *vol;
wimlib_assert(dentry_is_regular_file(from_dentry)
- && dentry_is_regular_file(to_dentry));
+ && inode_is_regular_file(inode));
if (ntfs_inode_close(dir_ni) != 0) {
ERROR_WITH_ERRNO("Error closing directory");
vol = dir_ni->vol;
DEBUG("Extracting NTFS hard link `%s' => `%s'",
- from_dentry->full_path_utf8, to_dentry->extracted_file);
+ from_dentry->full_path_utf8, inode->extracted_file);
- to_ni = ntfs_pathname_to_inode(vol, NULL,
- to_dentry->extracted_file);
+ to_ni = ntfs_pathname_to_inode(vol, NULL, inode->extracted_file);
if (!to_ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
- to_dentry->extracted_file);
+ inode->extracted_file);
return WIMLIB_ERR_NTFS_3G;
}
p = from_dentry->full_path_utf8 + from_dentry->full_path_utf8_len;
if (ret != 0) {
ERROR_WITH_ERRNO("Could not create hard link `%s' => `%s'",
from_dentry->full_path_utf8,
- to_dentry->extracted_file);
+ inode->extracted_file);
ret = WIMLIB_ERR_NTFS_3G;
}
*to_ni_ret = to_ni;
return ret;
}
-/*#define HAVE_NTFS_INODE_FUNCTIONS*/
-
static int
apply_file_attributes_and_security_data(ntfs_inode *ni,
ntfs_inode *dir_ni,
const WIMStruct *w)
{
DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
- dentry->full_path_utf8, dentry->attributes);
+ dentry->full_path_utf8, dentry->d_inode->attributes);
int ret;
-#ifdef HAVE_NTFS_INODE_FUNCTIONS
- ret = ntfs_set_inode_attributes(ni, dentry->attributes);
-#else
struct SECURITY_CONTEXT ctx;
u32 attributes_le32;
- attributes_le32 = cpu_to_le32(dentry->attributes);
+ attributes_le32 = cpu_to_le32(dentry->d_inode->attributes);
memset(&ctx, 0, sizeof(ctx));
ctx.vol = ni->vol;
ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ATTRIB,
ni, dir_ni,
(const char*)&attributes_le32,
sizeof(u32), 0);
-#endif
if (ret != 0) {
ERROR("Failed to set NTFS file attributes on `%s'",
dentry->full_path_utf8);
return WIMLIB_ERR_NTFS_3G;
}
- if (dentry->security_id != -1) {
+ if (dentry->d_inode->security_id != -1) {
const struct wim_security_data *sd;
const char *descriptor;
-
+
sd = wim_const_security_data(w);
- wimlib_assert(dentry->security_id < sd->num_entries);
- descriptor = sd->descriptors[dentry->security_id];
+ wimlib_assert(dentry->d_inode->security_id < sd->num_entries);
+ descriptor = (const char *)sd->descriptors[dentry->d_inode->security_id];
DEBUG("Applying security descriptor %d to `%s'",
- dentry->security_id, dentry->full_path_utf8);
-
- #ifdef HAVE_NTFS_INODE_FUNCTIONS
- u32 selection = OWNER_SECURITY_INFORMATION |
- GROUP_SECURITY_INFORMATION |
- DACL_SECURITY_INFORMATION |
- SACL_SECURITY_INFORMATION;
- ret = ntfs_set_inode_security(ni, selection, descriptor);
- #else
+ dentry->d_inode->security_id, dentry->full_path_utf8);
+
ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
ni, dir_ni, descriptor,
- sd->sizes[dentry->security_id], 0);
- #endif
-
+ sd->sizes[dentry->d_inode->security_id], 0);
+
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to set security data on `%s'",
dentry->full_path_utf8);
struct lookup_table_entry *lte;
int ret = 0;
- wimlib_assert(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT);
+ wimlib_assert(dentry->d_inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT);
- lte = dentry_unnamed_lte(dentry, w->lookup_table);
+ lte = inode_unnamed_lte(dentry->d_inode, w->lookup_table);
DEBUG("Applying reparse data to `%s'", dentry->full_path_utf8);
}
if (wim_resource_size(lte) >= 0xffff) {
- ERROR("Reparse data of `%s' is too long (%lu bytes)",
+ ERROR("Reparse data of `%s' is too long (%"PRIu64" bytes)",
dentry->full_path_utf8, wim_resource_size(lte));
return WIMLIB_ERR_INVALID_DENTRY;
}
u8 reparse_data_buf[8 + wim_resource_size(lte)];
u8 *p = reparse_data_buf;
- p = put_u32(p, dentry->reparse_tag); /* ReparseTag */
+ p = put_u32(p, dentry->d_inode->reparse_tag); /* ReparseTag */
p = put_u16(p, wim_resource_size(lte)); /* ReparseDataLength */
p = put_u16(p, 0); /* Reserved */
- ret = read_full_wim_resource(lte, p);
+ ret = read_full_wim_resource(lte, p, 0);
if (ret != 0)
return ret;
static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
WIMStruct *w);
-/*
+/*
* If @dentry is part of a hard link group, search for hard-linked dentries in
* the same directory that have a nonempty DOS (short) filename. There should
* be exactly 0 or 1 such dentries. If there is 1, extract that dentry first,
struct dentry *dentry_with_dos_name;
dentry_with_dos_name = NULL;
- list_for_each_entry(other, &dentry->link_group_list,
- link_group_list)
- {
- if (dentry->parent == other->parent && other->short_name_len) {
+ inode_for_each_dentry(other, dentry->d_inode) {
+ if (other != dentry && (dentry->parent == other->parent)
+ && other->short_name_len)
+ {
if (dentry_with_dos_name) {
ERROR("Found multiple DOS names for file `%s' "
"in the same directory",
}
}
/* If there's a dentry with a DOS name, extract it first */
- if (dentry_with_dos_name
- && !dentry_with_dos_name->extracted_file)
- {
+ if (dentry_with_dos_name && !dentry_is_extracted(dentry)) {
char *p;
const char *dir_name;
char orig;
return 0;
}
-/*
+/*
* Applies a WIM dentry to a NTFS filesystem.
*
* @dentry: The WIM dentry to apply
ntfs_inode *ni = NULL;
bool is_hardlink = false;
ntfs_volume *vol = dir_ni->vol;
+ struct inode *inode = dentry->d_inode;
+ dentry->is_extracted = true;
- if (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY) {
+ if (inode->attributes & FILE_ATTRIBUTE_DIRECTORY) {
type = S_IFDIR;
} else {
- struct dentry *other;
-
/* Apply hard-linked directory in same directory with DOS name
* (if there is one) before this dentry */
if (dentry->short_name_len == 0) {
}
type = S_IFREG;
- /* See if we can make a hard link */
- list_for_each_entry(other, &dentry->link_group_list,
- link_group_list) {
- if (other->extracted_file) {
- /* Already extracted another dentry in the hard
- * link group. We can make a hard link instead
- * of extracting the file data. */
- ret = wim_apply_hardlink_ntfs(dentry, other,
+
+ if (inode->link_count > 1) {
+ /* Already extracted another dentry in the hard link
+ * group. We can make a hard link instead of extracting
+ * the file data. */
+ if (inode->extracted_file) {
+ ret = wim_apply_hardlink_ntfs(dentry, inode,
dir_ni, &ni);
is_hardlink = true;
- if (ret) {
+ if (ret)
goto out_close_dir_ni;
- } else {
- dentry->extracted_file = dentry->full_path_utf8;
+ else
goto out_set_dos_name;
- }
+ }
+ /* Can't make a hard link; extract the file itself */
+ FREE(inode->extracted_file);
+ inode->extracted_file = STRDUP(dentry->full_path_utf8);
+ if (!inode->extracted_file) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_close_dir_ni;
}
}
- /* Can't make a hard link; extract the file itself */
- dentry->extracted_file = dentry->full_path_utf8;
}
- /*
+ /*
* Create a directory or file.
*
* Note: For symbolic links that are not directory junctions, pass
/* Write the data streams, unless this is a directory or reparse point
* */
- if (!dentry_is_directory(dentry) &&
- !(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+ if (!(inode->attributes & (FILE_ATTRIBUTE_REPARSE_POINT |
+ FILE_ATTRIBUTE_DIRECTORY))) {
ret = write_ntfs_data_streams(ni, dentry, w);
if (ret != 0)
goto out_close_dir_ni;
if (ret != 0)
goto out_close_dir_ni;
- if (dentry->attributes & FILE_ATTR_REPARSE_POINT) {
+ if (inode->attributes & FILE_ATTR_REPARSE_POINT) {
ret = apply_reparse_data(ni, dentry, w);
if (ret != 0)
goto out_close_dir_ni;
char orig;
const char *dir_name;
- if (dentry->extracted_file)
+ if (dentry_is_extracted(dentry))
return 0;
wimlib_assert(dentry->full_path_utf8);
}
p = buf;
- p = put_u64(p, dentry->creation_time);
- p = put_u64(p, dentry->last_write_time);
- p = put_u64(p, dentry->last_access_time);
+ p = put_u64(p, dentry->d_inode->creation_time);
+ p = put_u64(p, dentry->d_inode->last_write_time);
+ p = put_u64(p, dentry->d_inode->last_access_time);
ret = ntfs_inode_set_times(ni, (const char*)buf, 3 * sizeof(u64), 0);
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to set NTFS timestamps on `%s'",
return ret;
}
-static int dentry_clear_extracted_file(struct dentry *dentry, void *ignore)
+static int dentry_set_unextracted(struct dentry *dentry, void *ignore)
{
- if (dentry->extracted_file != dentry->full_path_utf8)
- FREE(dentry->extracted_file);
- dentry->extracted_file = NULL;
+ dentry->is_extracted = false;
return 0;
}
int ret;
struct dentry *root;
struct ntfs_apply_args args;
-
+
DEBUG("Mounting NTFS volume `%s'", device);
vol = ntfs_mount(device, 0);
if (!vol) {
args.w = w;
root = wim_root_dentry(w);
- for_dentry_in_tree(root, dentry_clear_extracted_file, NULL);
-
+ for_dentry_in_tree(root, dentry_set_unextracted, NULL);
ret = for_dentry_in_tree(root, wim_apply_dentry_ntfs, &args);
if (ret != 0)
goto out;
}
-/*
+/*
* API entry point for applying a WIM image to a NTFS volume.
*
* Please note that this is a NTFS *volume* and not a directory. The intention
w->lookup_table = joined_tab;
}
- ret = wimlib_select_image(w, image);
+ ret = select_wim_image(w, image);
if (ret != 0)
goto out;
git://wimlib.net / wimlib / blobdiff