X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=8408a461f01fb9604437ea3a537f4c4145ec173b;hb=3537ce00e3c430545c9abf57498d33a2ca5f216f;hp=7efed22b921b91c933df0284d76ea82924d73cc8;hpb=56f6607d5ecb59ab50f97c8b99f7fc92b9c67a39;p=wimlib diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c index 7efed22b..8408a461 100644 --- a/src/ntfs-3g_capture.c +++ b/src/ntfs-3g_capture.c @@ -6,7 +6,7 @@ */ /* - * 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 @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -38,20 +39,21 @@ #include "wimlib/alloca.h" #include "wimlib/assert.h" #include "wimlib/blob_table.h" -#include "wimlib/capture.h" #include "wimlib/dentry.h" #include "wimlib/encoding.h" #include "wimlib/endianness.h" #include "wimlib/error.h" #include "wimlib/ntfs_3g.h" +#include "wimlib/object_id.h" #include "wimlib/paths.h" #include "wimlib/reparse.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 @@ -70,7 +72,7 @@ struct ntfs_location { u64 mft_no; ATTR_TYPES attr_type; u32 attr_name_nchars; - utf16lechar *attr_name; + ntfschar *attr_name; u64 sort_key; }; @@ -167,7 +169,8 @@ void free_ntfs_location(struct ntfs_location *loc) { put_ntfs_volume(loc->volume); - FREE(loc->attr_name); + if (loc->attr_name != AT_UNNAMED) + FREE(loc->attr_name); FREE(loc); } @@ -177,7 +180,7 @@ clone_ntfs_location(const struct ntfs_location *loc) struct ntfs_location *new = memdup(loc, sizeof(*loc)); if (!new) goto err0; - if (loc->attr_name) { + if (loc->attr_name != AT_UNNAMED) { new->attr_name = utf16le_dup(loc->attr_name); if (!new->attr_name) goto err1; @@ -265,6 +268,44 @@ set_attr_sort_key(ntfs_inode *ni, struct ntfs_location *loc) return 0; } +/* + * Add a new stream to the specified inode, with duplicate checking. + * + * 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. + */ +static int +add_stream(struct wim_inode *inode, const char *path, int stream_type, + const utf16lechar *stream_name, struct blob_descriptor **blob_p, + struct list_head *unhashed_blobs) +{ + struct blob_descriptor *blob = *blob_p; + struct wim_inode_stream *strm; + + strm = inode_get_stream(inode, stream_type, stream_name); + if (unlikely(strm)) { + /* Stream already existed. */ + if (!blob) + return 0; + if (stream_blob_resolved(strm)) { + WARNING("\"%s\" has multiple nonempty streams " + "with the same type and name! Only the first " + "will be saved.", path); + return 0; + } + inode_replace_stream_blob(inode, strm, blob, NULL); + } else { + strm = inode_add_stream(inode, stream_type, stream_name, blob); + if (unlikely(!strm)) + return WIMLIB_ERR_NOMEM; + } + prepare_unhashed_blob(blob, inode, strm->stream_id, unhashed_blobs); + *blob_p = NULL; + return 0; + +} + /* Save information about an NTFS attribute (stream) to a WIM inode. */ static int scan_ntfs_attr(struct wim_inode *inode, @@ -278,8 +319,7 @@ scan_ntfs_attr(struct wim_inode *inode, u64 data_size = ntfs_get_attribute_value_length(record); const u32 name_nchars = record->name_length; struct blob_descriptor *blob = NULL; - utf16lechar *stream_name = NULL; - struct wim_inode_stream *strm; + utf16lechar *stream_name = (utf16lechar *)NO_STREAM_NAME; int ret; if (unlikely(name_nchars)) { @@ -317,7 +357,7 @@ scan_ntfs_attr(struct wim_inode *inode, goto out_cleanup; } - blob->ntfs_loc = CALLOC(1, sizeof(struct ntfs_location)); + blob->ntfs_loc = MALLOC(sizeof(struct ntfs_location)); if (unlikely(!blob->ntfs_loc)) { ret = WIMLIB_ERR_NOMEM; goto out_cleanup; @@ -326,16 +366,19 @@ scan_ntfs_attr(struct wim_inode *inode, blob->blob_location = BLOB_IN_NTFS_VOLUME; blob->size = data_size; blob->ntfs_loc->volume = get_ntfs_volume(volume); - blob->ntfs_loc->attr_type = type; blob->ntfs_loc->mft_no = ni->mft_no; + blob->ntfs_loc->attr_type = type; if (unlikely(name_nchars)) { + blob->ntfs_loc->attr_name_nchars = name_nchars; blob->ntfs_loc->attr_name = utf16le_dup(stream_name); if (!blob->ntfs_loc->attr_name) { ret = WIMLIB_ERR_NOMEM; goto out_cleanup; } - blob->ntfs_loc->attr_name_nchars = name_nchars; + } else { + blob->ntfs_loc->attr_name_nchars = 0; + blob->ntfs_loc->attr_name = AT_UNNAMED; } ret = set_attr_sort_key(ni, blob->ntfs_loc); @@ -343,20 +386,12 @@ scan_ntfs_attr(struct wim_inode *inode, goto out_cleanup; } - strm = inode_add_stream(inode, - attr_type_to_wimlib_stream_type(type), - stream_name ? stream_name : NO_STREAM_NAME, - blob); - if (unlikely(!strm)) { - ret = WIMLIB_ERR_NOMEM; - goto out_cleanup; - } - prepare_unhashed_blob(blob, inode, strm->stream_id, unhashed_blobs); - blob = NULL; - ret = 0; + ret = add_stream(inode, path, attr_type_to_wimlib_stream_type(type), + stream_name, &blob, unhashed_blobs); out_cleanup: free_blob_descriptor(blob); - FREE(stream_name); + if (stream_name != NO_STREAM_NAME) + FREE(stream_name); return ret; } @@ -403,6 +438,22 @@ out_put_actx: return ret; } +static noinline_for_stack int +load_object_id(ntfs_inode *ni, struct wim_inode *inode) +{ + OBJECT_ID_ATTR attr; + int len; + + len = ntfs_get_ntfs_object_id(ni, (char *)&attr, sizeof(attr)); + if (likely(len == -ENODATA || len == 0)) + return 0; + if (len < 0) + return WIMLIB_ERR_NTFS_3G; + if (!inode_set_object_id(inode, &attr, len)) + return WIMLIB_ERR_NOMEM; + return 0; +} + /* Load the security descriptor of an NTFS inode into the corresponding WIM * inode and the WIM image's security descriptor set. */ static noinline_for_stack int @@ -560,7 +611,7 @@ struct readdir_ctx { size_t path_len; struct dos_name_map dos_name_map; struct ntfs_volume_wrapper *volume; - struct capture_params *params; + struct scan_params *params; int ret; }; @@ -571,7 +622,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_p, size_t path_len, int name_type, struct ntfs_volume_wrapper *volume, - struct capture_params *params); + struct scan_params *params); static int filldir(void *_ctx, const ntfschar *name, const int name_nchars, @@ -625,7 +676,7 @@ static int ntfs_3g_recurse_directory(ntfs_inode *ni, char *path, size_t path_len, struct wim_dentry *parent, struct ntfs_volume_wrapper *volume, - struct capture_params *params) + struct scan_params *params) { int ret; s64 pos = 0; @@ -670,7 +721,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret, size_t path_len, int name_type, struct ntfs_volume_wrapper *volume, - struct capture_params *params) + struct scan_params *params) { u32 attributes; int ret; @@ -702,13 +753,13 @@ 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; } params->progress.scan.cur_path = path; - ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL); + ret = do_scan_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL); goto out; } @@ -743,6 +794,13 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret, goto out; } + /* Load the object ID. */ + ret = load_object_id(ni, inode); + if (ret) { + ERROR_WITH_ERRNO("Error reading object ID of \"%s\"", path); + goto out; + } + /* Scan the data streams. * * Note: directories should not have an unnamed data stream, but they @@ -754,7 +812,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)) @@ -780,16 +838,16 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret, out_progress: params->progress.scan.cur_path = path; if (root == NULL) - ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL); + ret = do_scan_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL); else - ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode); + ret = do_scan_progress(params, WIMLIB_SCAN_DENTRY_OK, inode); out: if (ni) ntfs_inode_close(ni); if (unlikely(ret)) { free_dentry_tree(root, params->blob_table); root = NULL; - ret = report_capture_error(params, ret, path); + ret = report_scan_error(params, ret, path); } *root_ret = root; return ret; @@ -797,8 +855,7 @@ out: int ntfs_3g_build_dentry_tree(struct wim_dentry **root_ret, - const char *device, - struct capture_params *params) + const char *device, struct scan_params *params) { struct ntfs_volume_wrapper *volume; ntfs_volume *vol;