X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=b496e02a723a51db0a2dd127b60a9ce70d6c169c;hb=f1460c1d7df10acd410aea0496147c1abe9ef24c;hp=9d973a23439d4915c8b205439c094d767df9c116;hpb=47fcf3c14dec59bb5338b6e53890ab83c0ad4f2b;p=wimlib diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c index 9d973a23..b496e02a 100644 --- a/src/ntfs-3g_capture.c +++ b/src/ntfs-3g_capture.c @@ -31,6 +31,7 @@ #include #include +#include /* for ENODATA, if needed */ #include #include #include @@ -50,10 +51,10 @@ #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 @@ -64,6 +65,7 @@ struct ntfs_volume_wrapper { ntfs_volume *vol; size_t refcnt; + bool dedup_warned; }; /* Description of where data is located in an NTFS volume */ @@ -230,6 +232,27 @@ read_reparse_header(ntfs_inode *ni, struct wim_inode *inode) 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) { @@ -271,7 +294,7 @@ set_attr_sort_key(ntfs_inode *ni, struct ntfs_location *loc) /* * 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. */ @@ -753,7 +776,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret, 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; @@ -792,6 +815,8 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret, volume, AT_REPARSE_POINT); if (ret) goto out; + + warn_special_reparse_points(inode, params, volume); } /* Load the object ID. */ @@ -812,7 +837,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret, 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)) @@ -862,7 +887,7 @@ ntfs_3g_build_dentry_tree(struct wim_dentry **root_ret, 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; @@ -877,7 +902,16 @@ ntfs_3g_build_dentry_tree(struct wim_dentry **root_ret, 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 @@ -889,7 +923,7 @@ ntfs_3g_build_dentry_tree(struct wim_dentry **root_ret, path = MALLOC(32768); if (!path) { ret = WIMLIB_ERR_NOMEM; - goto out_put_ntfs_volume; + goto out_close_secure; } path[0] = '/'; @@ -898,10 +932,17 @@ ntfs_3g_build_dentry_tree(struct wim_dentry **root_ret, 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; }