#include <errno.h>
#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/compat.h> /* for ENODATA, if needed */
#include <ntfs-3g/object_id.h>
#include <ntfs-3g/reparse.h>
#include <ntfs-3g/security.h>
#include "wimlib/scan.h"
#include "wimlib/security.h"
-/* NTFS-3g 2013 renamed MS_RDONLY to NTFS_MNT_RDONLY. We can't check for the
+/* NTFS-3G 2013 renamed MS_RDONLY to NTFS_MNT_RDONLY. We can't check for the
* existence of NTFS_MNT_RDONLY at compilation time because it's an enum. We
* also can't check for MS_RDONLY being missing because it's also a system
- * constant. So check if the NTFS-3g specific MS_IGNORE_HIBERFILE is defined;
+ * constant. So check if the NTFS-3G specific MS_IGNORE_HIBERFILE is defined;
* if yes, then we need to use the old MS_RDONLY. */
#ifdef MS_IGNORE_HIBERFILE
# define NTFS_MNT_RDONLY MS_RDONLY
struct ntfs_volume_wrapper {
ntfs_volume *vol;
size_t refcnt;
+ bool dedup_warned;
};
/* Description of where data is located in an NTFS volume */
int
read_ntfs_attribute_prefix(const struct blob_descriptor *blob, u64 size,
- const struct read_blob_callbacks *cbs)
+ const struct consume_chunk_callback *cb)
{
const struct ntfs_location *loc = blob->ntfs_loc;
ntfs_volume *vol = loc->volume->vol;
}
pos += to_read;
bytes_remaining -= to_read;
- ret = call_consume_chunk(buf, to_read, cbs);
+ ret = consume_chunk(cb, buf, to_read);
if (ret)
goto out_close_ntfs_attr;
}
return 0;
}
+
+static void
+warn_special_reparse_points(const struct wim_inode *inode,
+ const struct scan_params *params,
+ struct ntfs_volume_wrapper *volume)
+{
+ if (inode->i_reparse_tag == WIM_IO_REPARSE_TAG_DEDUP &&
+ (params->add_flags & WIMLIB_ADD_FLAG_WINCONFIG) &&
+ !volume->dedup_warned)
+ {
+ WARNING(
+ "Filesystem includes files deduplicated with Windows'\n"
+" Data Deduplication feature, which to properly restore\n"
+" would require that the chunk store in \"System Volume Information\"\n"
+" be included in the WIM image. By default \"System Volume Information\"\n"
+" is excluded, so you may want to use a custom capture configuration\n"
+" file which includes it.");
+ volume->dedup_warned = true;
+ }
+}
+
static int
attr_type_to_wimlib_stream_type(ATTR_TYPES type)
{
/*
* Add a new stream to the specified inode, with duplicate checking.
*
- * This works around a problem where NTFS-3g can list multiple unnamed data
+ * This works around a problem where NTFS-3G can list multiple unnamed data
* streams for a single file. In this case we can only keep one. We'll prefer
* one that is nonempty.
*/
if (unlikely(attributes & FILE_ATTRIBUTE_ENCRYPTED)) {
if (params->add_flags & WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
{
- ERROR("Can't archive \"%s\" because NTFS-3g capture mode "
+ ERROR("Can't archive \"%s\" because NTFS-3G capture mode "
"does not support encrypted files and directories", path);
ret = WIMLIB_ERR_UNSUPPORTED_FILE;
goto out;
volume, AT_REPARSE_POINT);
if (ret)
goto out;
+
+ warn_special_reparse_points(inode, params, volume);
}
/* Load the object ID. */
if (ret)
goto out;
- /* Reparse-point fixups are a no-op because in NTFS-3g capture mode we
+ /* Reparse-point fixups are a no-op because in NTFS-3G capture mode we
* only allow capturing an entire volume. */
if (params->add_flags & WIMLIB_ADD_FLAG_RPFIX &&
inode_is_symlink(inode))
char *path;
int ret;
- volume = MALLOC(sizeof(struct ntfs_volume_wrapper));
+ volume = CALLOC(1, sizeof(struct ntfs_volume_wrapper));
if (!volume)
return WIMLIB_ERR_NOMEM;
volume->vol = vol;
volume->refcnt = 1;
- ntfs_open_secure(vol);
+ /* Currently, libntfs-3g users that need to read security descriptors
+ * are required to call ntfs_open_secure() to open the volume's security
+ * descriptor index, "$Secure". This is only required to work on NTFS
+ * v3.0+, as older versions did not have a security descriptor index. */
+ if (ntfs_open_secure(vol) && vol->major_ver >= 3) {
+ ERROR_WITH_ERRNO("Unable to open security descriptor index of "
+ "NTFS volume \"%s\"", device);
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out_put_ntfs_volume;
+ }
/* We don't want to capture the special NTFS files such as $Bitmap. Not
* to be confused with "hidden" or "system" files which are real files
path = MALLOC(32768);
if (!path) {
ret = WIMLIB_ERR_NOMEM;
- goto out_put_ntfs_volume;
+ goto out_close_secure;
}
path[0] = '/';
FILE_NAME_POSIX, volume,
params);
FREE(path);
+out_close_secure:
+ /* Undo the effects of ntfs_open_secure(). This is not yet done
+ * automatically by ntfs_umount(). But NULL out the inode to
+ * potentially be robust against future versions doing so. */
+ if (vol->secure_ni) {
+ ntfs_index_ctx_put(vol->secure_xsii);
+ ntfs_index_ctx_put(vol->secure_xsdh);
+ ntfs_inode_close(vol->secure_ni);
+ vol->secure_ni = NULL;
+ }
out_put_ntfs_volume:
- ntfs_index_ctx_put(vol->secure_xsii);
- ntfs_index_ctx_put(vol->secure_xsdh);
- ntfs_inode_close(vol->secure_ni);
put_ntfs_volume(volume);
return ret;
}