summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
bfaa00b)
- Add and fix comments
- Fix memory leak in an error path
#include <ntfs-3g/endians.h>
#include <ntfs-3g/types.h>
#include "wimlib_internal.h"
#include <ntfs-3g/endians.h>
#include <ntfs-3g/types.h>
#include "wimlib_internal.h"
#include "dentry.h"
#include "lookup_table.h"
#include "dentry.h"
#include "lookup_table.h"
-#include "buffer_io.h"
-#include <ntfs-3g/layout.h>
-#include <ntfs-3g/acls.h>
#include <ntfs-3g/attrib.h>
#include <ntfs-3g/security.h> /* security.h before xattrs.h */
#include <ntfs-3g/attrib.h>
#include <ntfs-3g/security.h> /* security.h before xattrs.h */
-#include <ntfs-3g/xattrs.h>
#include <ntfs-3g/reparse.h>
#include <ntfs-3g/reparse.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <ntfs-3g/xattrs.h>
+#include <string.h>
static int extract_wim_chunk_to_ntfs_attr(const u8 *buf, size_t len,
u64 offset, void *arg)
static int extract_wim_chunk_to_ntfs_attr(const u8 *buf, size_t len,
u64 offset, void *arg)
extract_wim_chunk_to_ntfs_attr, na);
}
extract_wim_chunk_to_ntfs_attr, na);
}
-/* Writes the data streams to a NTFS file
+/* Writes the data streams of a WIM inode to the data attributes of a NTFS
+ * inode.
- * @ni: The NTFS inode for the file.
- * @inode: The WIM dentry that has an inode containing the streams.
+ * @ni: The NTFS inode to which the streams are to be extracted.
+ *
+ * @dentry: The WIM dentry being extracted. The @d_inode member points to the
+ * corresponding WIM inode that contains the streams being extracted.
+ * The WIM dentry itself is only needed to provide a file path for
+ * better error messages.
+ *
+ * @progress_info: Progress information for the image application. The number
+ * of extracted bytes will be incremented by the uncompressed
+ * size of each stream extracted.
*
* Returns 0 on success, nonzero on failure.
*/
*
* Returns 0 on success, nonzero on failure.
*/
ntfschar *stream_name = AT_UNNAMED;
u32 stream_name_len = 0;
const struct inode *inode = dentry->d_inode;
ntfschar *stream_name = AT_UNNAMED;
u32 stream_name_len = 0;
const struct inode *inode = dentry->d_inode;
+ struct lookup_table_entry *lte;
DEBUG("Writing %u NTFS data stream%s for `%s'",
inode->num_ads + 1,
(inode->num_ads == 0 ? "" : "s"),
dentry->full_path_utf8);
DEBUG("Writing %u NTFS data stream%s for `%s'",
inode->num_ads + 1,
(inode->num_ads == 0 ? "" : "s"),
dentry->full_path_utf8);
- struct lookup_table_entry *lte;
-
- lte = inode_stream_lte_resolved(inode, stream_idx);
-
if (stream_name_len) {
/* Create an empty named stream. */
ret = ntfs_attr_add(ni, AT_DATA, stream_name,
if (stream_name_len) {
/* Create an empty named stream. */
ret = ntfs_attr_add(ni, AT_DATA, stream_name,
/* If there's no lookup table entry, it's an empty stream.
/* If there's no lookup table entry, it's an empty stream.
- * Otherwise, we must open the attribute and extract the data.
- * */
+ * Otherwise, open the attribute and extract the data. */
if (lte) {
ntfs_attr *na;
if (lte) {
ntfs_attr *na;
ret = WIMLIB_ERR_NTFS_3G;
break;
}
ret = WIMLIB_ERR_NTFS_3G;
break;
}
+
+ /* The WIM lookup table entry provides the stream
+ * length, so the NTFS attribute should be resized to
+ * this length before starting to extract the data. */
ret = ntfs_attr_truncate_solid(na, wim_resource_size(lte));
if (ret != 0) {
ntfs_attr_close(na);
break;
}
ret = ntfs_attr_truncate_solid(na, wim_resource_size(lte));
if (ret != 0) {
ntfs_attr_close(na);
break;
}
+ /* Actually extract the stream */
ret = extract_wim_resource_to_ntfs_attr(lte, na);
ret = extract_wim_resource_to_ntfs_attr(lte, na);
+
+ /* Close the attribute */
ntfs_attr_close(na);
if (ret != 0)
break;
ntfs_attr_close(na);
if (ret != 0)
break;
+
+ /* Record the number of bytes of uncompressed data that
+ * have been extracted. */
progress_info->extract.completed_bytes += wim_resource_size(lte);
}
progress_info->extract.completed_bytes += wim_resource_size(lte);
}
- if (stream_idx == inode->num_ads)
+ if (stream_idx == inode->num_ads) /* Has the last stream been extracted? */
+
+ /* Get the name and lookup table entry for the next stream. */
stream_name = (ntfschar*)inode->ads_entries[stream_idx].stream_name;
stream_name_len = inode->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;
+ lte = inode->ads_entries[stream_idx].lte;
stream_idx++;
}
return ret;
}
stream_idx++;
}
return ret;
}
-/* Open the NTFS inode that corresponds to the parent of a WIM dentry. */
+/* Open the NTFS inode that corresponds to the parent of a WIM dentry. Returns
+ * the opened inode, or NULL on failure. */
static ntfs_inode *dentry_open_parent_ni(const struct dentry *dentry,
ntfs_volume *vol)
{
static ntfs_inode *dentry_open_parent_ni(const struct dentry *dentry,
ntfs_volume *vol)
{
- * Makes a NTFS hard link
+ * Makes a NTFS hard link.
- * 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 @inode->extracted_file.
+ * The hard link 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 @inode->extracted_file.
+ *
+ * Or, in other words, this adds a new name @from_dentry->full_path_utf8 to an
+ * existing NTFS inode which already has a name @inode->extracted_file.
*
* Return 0 on success, nonzero on failure.
*/
*
* Return 0 on success, nonzero on failure.
*/
+/* Transfers file attributes and possibly a security descriptor from a WIM inode
+ * to a NTFS inode.
+ *
+ * @ni: The NTFS inode to apply the metadata to.
+ * @dir_ni: The NTFS inode for a directory containing @ni.
+ * @dentry: The WIM dentry whose inode contains the metadata to apply.
+ * @w: The WIMStruct for the WIM, through which the table of security
+ * descriptors can be accessed.
+ *
+ * Returns 0 on success, nonzero on failure.
+ */
static int
apply_file_attributes_and_security_data(ntfs_inode *ni,
ntfs_inode *dir_ni,
const struct dentry *dentry,
const WIMStruct *w)
{
static int
apply_file_attributes_and_security_data(ntfs_inode *ni,
ntfs_inode *dir_ni,
const struct dentry *dentry,
const WIMStruct *w)
{
- DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
- dentry->full_path_utf8, dentry->d_inode->attributes);
int ret;
struct SECURITY_CONTEXT ctx;
u32 attributes_le32;
int ret;
struct SECURITY_CONTEXT ctx;
u32 attributes_le32;
- attributes_le32 = cpu_to_le32(dentry->d_inode->attributes);
+ const struct inode *inode;
+
+ inode = dentry->d_inode;
+
+ DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
+ dentry->full_path_utf8, inode->attributes);
+
+ attributes_le32 = cpu_to_le32(inode->attributes);
memset(&ctx, 0, sizeof(ctx));
ctx.vol = ni->vol;
ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ATTRIB,
memset(&ctx, 0, sizeof(ctx));
ctx.vol = ni->vol;
ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ATTRIB,
dentry->full_path_utf8);
return WIMLIB_ERR_NTFS_3G;
}
dentry->full_path_utf8);
return WIMLIB_ERR_NTFS_3G;
}
- if (dentry->d_inode->security_id != -1) {
+ if (inode->security_id != -1) {
+ const char *desc;
const struct wim_security_data *sd;
const struct wim_security_data *sd;
- const char *descriptor;
sd = wim_const_security_data(w);
sd = wim_const_security_data(w);
- wimlib_assert(dentry->d_inode->security_id < sd->num_entries);
- descriptor = (const char *)sd->descriptors[dentry->d_inode->security_id];
+ wimlib_assert(inode->security_id < sd->num_entries);
+ desc = (const char *)sd->descriptors[inode->security_id];
DEBUG("Applying security descriptor %d to `%s'",
DEBUG("Applying security descriptor %d to `%s'",
- dentry->d_inode->security_id, dentry->full_path_utf8);
+ inode->security_id, dentry->full_path_utf8);
ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
- ni, dir_ni, descriptor,
- sd->sizes[dentry->d_inode->security_id], 0);
+ ni, dir_ni, desc,
+ sd->sizes[inode->security_id], 0);
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to set security data on `%s'",
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to set security data on `%s'",
+/*
+ * Transfers the reparse data from a WIM inode (which must represent a reparse
+ * point) to a NTFS inode.
+ */
static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry,
union wimlib_progress_info *progress_info)
{
static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry,
union wimlib_progress_info *progress_info)
{
int ret = 0;
mode_t type;
ntfs_inode *ni = NULL;
int ret = 0;
mode_t type;
ntfs_inode *ni = NULL;
- bool is_hardlink = false;
ntfs_volume *vol = dir_ni->vol;
struct inode *inode = dentry->d_inode;
dentry->is_extracted = 1;
ntfs_volume *vol = dir_ni->vol;
struct inode *inode = dentry->d_inode;
dentry->is_extracted = 1;
if (ret != 0)
return ret;
}
if (ret != 0)
return ret;
}
if (inode->link_count > 1) {
if (inode->link_count > 1) {
- /* Already extracted another dentry in the hard link
- * group. Make a hard link instead of extracting the
- * file data. */
+ /* Inode has multiple dentries referencing it. */
+
if (inode->extracted_file) {
if (inode->extracted_file) {
+ /* Already extracted another dentry in the hard
+ * link group. Make a hard link instead of
+ * extracting the file data. */
ret = apply_ntfs_hardlink(dentry, inode,
&dir_ni);
ret = apply_ntfs_hardlink(dentry, inode,
&dir_ni);
- is_hardlink = true;
- if (ret)
- goto out_close_dir_ni;
- else
- }
- /* 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;
+ else
+ goto out_close_dir_ni;
+ } else {
+ /* None of the dentries of this inode have been
+ * extracted yet, so go ahead and extract the
+ * first one. */
+ 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;
+ }
- /*
- * Create a directory or file.
+ /* Create a NTFS directory or file.
- * Note: For symbolic links that are not directory junctions, pass
- * S_IFREG here, since we manually set the reparse data later.
- */
+ * Note: For symbolic links that are not directory junctions, S_IFREG is
+ * passed here, since the reparse data and file attributes are set
+ * later. */
ni = ntfs_create(dir_ni, 0, (ntfschar*)dentry->file_name,
dentry->file_name_len / 2, type);
if (!ni) {
ni = ntfs_create(dir_ni, 0, (ntfschar*)dentry->file_name,
dentry->file_name_len / 2, type);
if (!ni) {
- ERROR_WITH_ERRNO("Could not create NTFS object for `%s'",
+ ERROR_WITH_ERRNO("Could not create NTFS inode for `%s'",
dentry->full_path_utf8);
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_dir_ni;
dentry->full_path_utf8);
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_dir_ni;
- ret = apply_file_attributes_and_security_data(ni, dir_ni,
- dentry, args->w);
+ ret = apply_file_attributes_and_security_data(ni, dir_ni, dentry,
+ args->w);
if (ret != 0)
goto out_close_dir_ni;
if (ret != 0)
goto out_close_dir_ni;
if (ret != 0)
goto out_close_dir_ni;
if (ret != 0)
goto out_close_dir_ni;
- if (is_hardlink) {
- wimlib_assert(ni == NULL);
+ if (!ni) {
+ /* Hardlink was made; linked inode needs to be looked up
+ * again. */
ni = ntfs_pathname_to_inode(vol, dir_ni,
dentry->file_name_utf8);
if (!ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
dentry->full_path_utf8);
ni = ntfs_pathname_to_inode(vol, dir_ni,
dentry->file_name_utf8);
if (!ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
dentry->full_path_utf8);
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_dir_ni;
}
}
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_dir_ni;
}
}
- wimlib_assert(ni != NULL);
-
DEBUG("Setting short (DOS) name of `%s' to %s",
dentry->full_path_utf8, short_name_utf8);
DEBUG("Setting short (DOS) name of `%s' to %s",
dentry->full_path_utf8, short_name_utf8);
if (ntfs_inode_close(dir_ni)) {
if (ret == 0)
ret = WIMLIB_ERR_NTFS_3G;
if (ntfs_inode_close(dir_ni)) {
if (ret == 0)
ret = WIMLIB_ERR_NTFS_3G;
- ERROR_WITH_ERRNO("Failed to close directory inode");
+ ERROR_WITH_ERRNO("Failed to close inode of directory "
+ "containing `%s'", dentry->full_path_utf8);
}
} else {
wimlib_assert(ni == NULL);
}
} else {
wimlib_assert(ni == NULL);
ntfs_inode *ni;
int ret = 0;
ntfs_inode *ni;
int ret = 0;
- wimlib_assert(dentry_is_directory(dentry));
ni = ntfs_pathname_to_inode(vol, NULL, "/");
if (!ni) {
ERROR_WITH_ERRNO("Could not find root NTFS inode");
ni = ntfs_pathname_to_inode(vol, NULL, "/");
if (!ni) {
ERROR_WITH_ERRNO("Could not find root NTFS inode");
return WIMLIB_ERR_NTFS_3G;
}
return WIMLIB_ERR_NTFS_3G;
}
+/* Transfers the 100-nanosecond precision timestamps from a WIM dentry to a NTFS
+ * inode */
int apply_dentry_timestamps_ntfs(struct dentry *dentry, void *arg)
{
struct apply_args *args = arg;
int apply_dentry_timestamps_ntfs(struct dentry *dentry, void *arg)
{
struct apply_args *args = arg;
u8 *p;
u8 buf[24];
ntfs_inode *ni;
u8 *p;
u8 buf[24];
ntfs_inode *ni;
DEBUG("Setting timestamps on `%s'", dentry->full_path_utf8);
DEBUG("Setting timestamps on `%s'", dentry->full_path_utf8);
git://wimlib.net / wimlib / commitdiff