*/
/*
- * 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
#include <errno.h>
#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/object_id.h>
#include <ntfs-3g/reparse.h>
#include <ntfs-3g/security.h>
#include <ntfs-3g/volume.h>
#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
u64 mft_no;
ATTR_TYPES attr_type;
u32 attr_name_nchars;
- utf16lechar *attr_name;
+ ntfschar *attr_name;
u64 sort_key;
};
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);
}
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;
/*
* 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.
*/
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;
+ utf16lechar *stream_name = (utf16lechar *)NO_STREAM_NAME;
int ret;
if (unlikely(name_nchars)) {
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;
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);
}
ret = add_stream(inode, path, attr_type_to_wimlib_stream_type(type),
- stream_name ? stream_name : NO_STREAM_NAME,
- &blob, unhashed_blobs);
+ 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;
}
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
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;
};
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,
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;
size_t path_len,
int name_type,
struct ntfs_volume_wrapper *volume,
- struct capture_params *params)
+ struct scan_params *params)
{
u32 attributes;
int 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;
}
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
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))
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;
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;
git://wimlib.net / wimlib / blobdiff