X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_apply.c;h=b90d64596c428f6f83b2bf0a89efdafab2ec1227;hb=1286732b50846a3bd4ebde0903e446683503bec3;hp=9f06bbe6df763f94a62b640002aeeb8c86750b53;hpb=dc1b5c09160f46253c4fbbaf92b14cc3abb408ff;p=wimlib diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c index 9f06bbe6..b90d6459 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 + * 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; @@ -298,7 +302,7 @@ ntfs_3g_restore_dos_name(ntfs_inode *ni, ntfs_inode *dir_ni, goto out_close; } - /* Unlike most other NTFS-3g functions, ntfs_set_ntfs_dos_name() + /* Unlike most other NTFS-3G functions, ntfs_set_ntfs_dos_name() * changes the directory's last modification timestamp... * Change it back. */ return ntfs_3g_restore_timestamps(vol, dentry->d_parent->d_inode); @@ -322,9 +326,18 @@ 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; } @@ -402,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; @@ -446,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; @@ -983,7 +1015,7 @@ ntfs_3g_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) struct wim_dentry *root; int ret; - /* For NTFS-3g extraction mode we require that the dentries to extract + /* For NTFS-3G extraction mode we require that the dentries to extract * form a single tree. */ root = list_first_entry(dentry_list, struct wim_dentry, d_extraction_list_node); @@ -991,7 +1023,7 @@ ntfs_3g_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) /* Mount the NTFS volume. */ vol = ntfs_mount(ctx->common.target, 0); if (!vol) { - ERROR_WITH_ERRNO("Failed to mount \"%s\" with NTFS-3g", + ERROR_WITH_ERRNO("Failed to mount \"%s\" with NTFS-3G", ctx->common.target); return WIMLIB_ERR_NTFS_3G; } @@ -1032,7 +1064,7 @@ ntfs_3g_extract(struct list_head *dentry_list, struct apply_ctx *_ctx) out_unmount: if (ntfs_umount(ctx->vol, FALSE) && !ret) { - ERROR_WITH_ERRNO("Failed to unmount \"%s\" with NTFS-3g", + ERROR_WITH_ERRNO("Failed to unmount \"%s\" with NTFS-3G", ctx->common.target); ret = WIMLIB_ERR_NTFS_3G; } @@ -1040,7 +1072,7 @@ out_unmount: } const struct apply_operations ntfs_3g_apply_ops = { - .name = "NTFS-3g", + .name = "NTFS-3G", .get_supported_features = ntfs_3g_get_supported_features, .extract = ntfs_3g_extract, .context_size = sizeof(struct ntfs_3g_apply_ctx),