X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_apply.c;h=9f04dbea5b65b6180c0612461fa4a9099ce2deda;hb=4e0e062e081fcbb6a660084308287926c52c9353;hp=d0f3bb6cc86b0b850e43e7547cf5e2fb936824ed;hpb=a2cc0be5a6e24877e8beee7688816ff7cf56cec4;p=wimlib diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c index d0f3bb6c..9f04dbea 100644 --- a/src/ntfs-3g_apply.c +++ b/src/ntfs-3g_apply.c @@ -3,14 +3,14 @@ * * Apply a WIM image directly to an NTFS volume using libntfs-3g. Restore as * much information as possible, including security data, file attributes, DOS - * names, and alternate data streams. + * names, alternate data streams, and object IDs. * * Note: because NTFS-3g offers inode-based interfaces, we actually don't need * to deal with paths at all! (Other than for error messages.) */ /* - * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers + * Copyright (C) 2012-2016 Eric Biggers * * This file is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -46,6 +47,7 @@ #include "wimlib/error.h" #include "wimlib/metadata.h" #include "wimlib/ntfs_3g.h" +#include "wimlib/object_id.h" #include "wimlib/reparse.h" #include "wimlib/security.h" #include "wimlib/security_descriptor.h" @@ -54,9 +56,10 @@ static int ntfs_3g_get_supported_features(const char *target, struct wim_features *supported_features) { - supported_features->archive_files = 1; + supported_features->readonly_files = 1; supported_features->hidden_files = 1; supported_features->system_files = 1; + supported_features->archive_files = 1; supported_features->compressed_files = 1; supported_features->not_context_indexed_files = 1; supported_features->named_data_streams = 1; @@ -64,6 +67,7 @@ ntfs_3g_get_supported_features(const char *target, supported_features->reparse_points = 1; supported_features->security_descriptors = 1; supported_features->short_names = 1; + supported_features->object_ids = 1; supported_features->timestamps = 1; supported_features->case_sensitive_filenames = 1; return 0; @@ -322,15 +326,37 @@ ntfs_3g_restore_reparse_point(ntfs_inode *ni, const struct wim_inode *inode, if (ntfs_set_ntfs_reparse_data(ni, (const char *)&ctx->rpbuf, REPARSE_DATA_OFFSET + blob_size, 0)) { + int err = errno; ERROR_WITH_ERRNO("Failed to set reparse data on \"%s\"", dentry_full_path( inode_first_extraction_dentry(inode))); + if (err == EINVAL && !(inode->i_reparse_tag & 0x80000000)) { + WARNING("This reparse point had a non-Microsoft reparse " + "tag. The preceding error may have been caused " + "by a known bug in libntfs-3g where it does not " + "correctly validate non-Microsoft reparse " + "points. This bug may be fixed in the 2016 " + "release of libntfs-3g."); + } return WIMLIB_ERR_SET_REPARSE_DATA; } return 0; } +static bool +ntfs_3g_has_empty_attributes(const struct wim_inode *inode) +{ + for (unsigned i = 0; i < inode->i_num_streams; i++) { + const struct wim_inode_stream *strm = &inode->i_streams[i]; + + if (stream_blob_resolved(strm) == NULL && + (strm->stream_type == STREAM_TYPE_REPARSE_POINT || + stream_is_named_data_stream(strm))) + return true; + } + return false; +} /* * Create empty attributes (named data streams and potentially a reparse point) @@ -338,13 +364,14 @@ ntfs_3g_restore_reparse_point(ntfs_inode *ni, const struct wim_inode *inode, * * Since these won't have blob descriptors, they won't show up in the call to * extract_blob_list(). Hence the need for the special case. + * + * Keep this in sync with ntfs_3g_has_empty_attributes()! */ static int ntfs_3g_create_empty_attributes(ntfs_inode *ni, const struct wim_inode *inode, struct ntfs_3g_apply_ctx *ctx) { - for (unsigned i = 0; i < inode->i_num_streams; i++) { const struct wim_inode_stream *strm = &inode->i_streams[i]; @@ -388,6 +415,25 @@ ntfs_3g_set_metadata(ntfs_inode *ni, const struct wim_inode *inode, sd = wim_get_current_security_data(ctx->common.wim); one_dentry = inode_first_extraction_dentry(inode); + /* Object ID */ + { + u32 len; + const void *object_id = inode_get_object_id(inode, &len); + if (unlikely(object_id != NULL) && + ntfs_set_ntfs_object_id(ni, object_id, len, 0)) + { + if (errno == EEXIST) { + WARNING("Duplicate object ID on file \"%s\"", + dentry_full_path(one_dentry)); + } else { + ERROR_WITH_ERRNO("Failed to set object ID on " + "\"%s\" in NTFS volume", + dentry_full_path(one_dentry)); + return WIMLIB_ERR_NTFS_3G; + } + } + } + /* Attributes */ if (!(extract_flags & WIMLIB_EXTRACT_FLAG_NO_ATTRIBUTES)) { u32 attrib = inode->i_attributes; @@ -432,7 +478,7 @@ ntfs_3g_set_metadata(ntfs_inode *ni, const struct wim_inode *inode, "the security descriptor is invalid. If you " "are extracting a Windows 10 image, this may be " "caused by a known bug in libntfs-3g. See: " - "http://wimlib.net/forums/viewtopic.php?f=1&t=4 " + "https://wimlib.net/forums/viewtopic.php?f=1&t=4 " "for more information.\n\n"); } return ret; @@ -480,8 +526,6 @@ ntfs_3g_create_dirs_recursive(ntfs_inode *dir_ni, struct wim_dentry *dir, ret = report_file_created(&ctx->common); if (!ret) ret = ntfs_3g_set_metadata(ni, child->d_inode, ctx); - if (!ret) - ret = ntfs_3g_create_empty_attributes(ni, child->d_inode, ctx); if (!ret) ret = ntfs_3g_create_dirs_recursive(ni, child, ctx); @@ -518,8 +562,6 @@ ntfs_3g_create_directories(struct wim_dentry *root, root->d_inode->i_mft_no = FILE_root; ret = ntfs_3g_set_metadata(root_ni, root->d_inode, ctx); - if (!ret) - ret = ntfs_3g_create_empty_attributes(root_ni, root->d_inode, ctx); if (!ret) ret = ntfs_3g_create_dirs_recursive(root_ni, root, ctx); @@ -530,18 +572,44 @@ ntfs_3g_create_directories(struct wim_dentry *root, if (ret) return ret; - /* Set the DOS name of any directory that has one. */ + /* Set the DOS name of any directory that has one. In addition, create + * empty attributes for directories that have them. Note that creating + * an empty reparse point attribute must happen *after* setting the + * DOS name in order to work around a case where + * ntfs_set_ntfs_dos_name() fails with EOPNOTSUPP. */ list_for_each_entry(dentry, dentry_list, d_extraction_list_node) { - if (!(dentry->d_inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY)) - continue; - if (!dentry_has_short_name(dentry)) + const struct wim_inode *inode = dentry->d_inode; + + if (!(inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY)) continue; - ret = ntfs_3g_restore_dos_name(NULL, NULL, dentry, ctx->vol); - if (ret) - return ret; - ret = report_file_created(&ctx->common); - if (ret) - return ret; + if (dentry_has_short_name(dentry)) { + ret = ntfs_3g_restore_dos_name(NULL, NULL, dentry, + ctx->vol); + if (ret) + return ret; + ret = report_file_created(&ctx->common); + if (ret) + return ret; + } + if (ntfs_3g_has_empty_attributes(inode)) { + ntfs_inode *ni; + + ret = WIMLIB_ERR_NTFS_3G; + ni = ntfs_inode_open(ctx->vol, inode->i_mft_no); + if (ni) { + ret = ntfs_3g_create_empty_attributes(ni, inode, + ctx); + if (ntfs_inode_close(ni) && !ret) + ret = WIMLIB_ERR_NTFS_3G; + } + if (ret) { + ERROR_WITH_ERRNO("Failed to create empty " + "attributes of directory " + "\"%s\" in NTFS volume", + dentry_full_path(dentry)); + return ret; + } + } } return 0; }