* ntfs-capture.c
*
* Capture a WIM image from a NTFS volume. We capture everything we can,
- * including security data and alternate data streams. There should be no loss
- * of information.
+ * including security data and alternate data streams.
*/
/*
* This file is part of wimlib, a library for working with WIM files.
*
* wimlib 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
- * Software Foundation; either version 2.1 of the License, or (at your option)
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
* any later version.
*
* wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
+
#include "config.h"
+
+#ifdef WITH_NTFS_3G
+#include <ntfs-3g/endians.h>
+#include <ntfs-3g/types.h>
+#endif
+
#include "wimlib_internal.h"
#include <ntfs-3g/attrib.h>
#include <ntfs-3g/misc.h>
#include <ntfs-3g/reparse.h>
-#include <ntfs-3g/security.h>
+#include <ntfs-3g/security.h> /* security.h before xattrs.h */
+#include <ntfs-3g/xattrs.h>
#include <ntfs-3g/volume.h>
#include <stdlib.h>
#include <unistd.h>
+#include <errno.h>
-extern int ntfs_inode_get_security(ntfs_inode *ni, u32 selection, char *buf,
+#if 0
+extern int ntfs_get_inode_security(ntfs_inode *ni, u32 selection, char *buf,
u32 buflen, u32 *psize);
-extern int ntfs_inode_get_attributes(ntfs_inode *ni);
+extern u32 ntfs_get_inode_attributes(ntfs_inode *ni);
+#endif
/* Structure that allows searching the security descriptors by SHA1 message
* digest. */
size_t stream_name_utf16_len;
u32 reparse_tag;
u64 data_size = ntfs_get_attribute_value_length(actx->attr);
+ u64 name_length = actx->attr->name_length;
if (data_size == 0) {
if (errno != 0) {
lte = NULL;
} else {
if (type == AT_REPARSE_POINT && data_size < 8) {
- ERROR("`%s': reparse point buffer too small");
+ ERROR("`%s': reparse point buffer too small",
+ path);
ret = WIMLIB_ERR_NTFS_3G;
goto out_put_actx;
}
if (!ntfs_loc->path_utf8)
goto out_free_ntfs_loc;
memcpy(ntfs_loc->path_utf8, path, path_len + 1);
- ntfs_loc->stream_name_utf16 = MALLOC(actx->attr->name_length * 2);
- if (!ntfs_loc->stream_name_utf16)
- goto out_free_ntfs_loc;
- memcpy(ntfs_loc->stream_name_utf16,
- attr_record_name(actx->attr),
- actx->attr->name_length * 2);
+ if (name_length) {
+ ntfs_loc->stream_name_utf16 = MALLOC(name_length * 2);
+ if (!ntfs_loc->stream_name_utf16)
+ goto out_free_ntfs_loc;
+ memcpy(ntfs_loc->stream_name_utf16,
+ attr_record_name(actx->attr),
+ actx->attr->name_length * 2);
+ ntfs_loc->stream_name_utf16_num_chars = name_length;
+ }
- ntfs_loc->stream_name_utf16_num_chars = actx->attr->name_length;
lte = new_lookup_table_entry();
if (!lte)
goto out_free_ntfs_loc;
lte->ntfs_loc = ntfs_loc;
lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
if (type == AT_REPARSE_POINT) {
- dentry->reparse_tag = reparse_tag;
+ dentry->inode->reparse_tag = reparse_tag;
ntfs_loc->is_reparse_point = true;
lte->resource_entry.original_size = data_size - 8;
lte->resource_entry.size = data_size - 8;
}
ntfs_loc = NULL;
DEBUG("Add resource for `%s' (size = %zu)",
- dentry->file_name_utf8,
- lte->resource_entry.original_size);
+ dentry->file_name_utf8,
+ lte->resource_entry.original_size);
copy_hash(lte->hash, attr_hash);
lookup_table_insert(lookup_table, lte);
}
}
- if (actx->attr->name_length == 0) {
+ if (name_length == 0) {
/* Unnamed data stream. Put the reference to it in the
- * dentry. */
- if (dentry->lte) {
+ * dentry's inode. */
+ if (dentry->inode->lte) {
ERROR("Found two un-named data streams for "
"`%s'", path);
ret = WIMLIB_ERR_NTFS_3G;
goto out_free_lte;
}
- dentry->lte = lte;
+ dentry->inode->lte = lte;
} else {
/* Named data stream. Put the reference to it in the
* alternate data stream entries */
struct ads_entry *new_ads_entry;
size_t stream_name_utf8_len;
stream_name_utf8 = utf16_to_utf8((const char*)attr_record_name(actx->attr),
- actx->attr->name_length,
+ name_length * 2,
&stream_name_utf8_len);
if (!stream_name_utf8)
goto out_free_lte;
- new_ads_entry = dentry_add_ads(dentry, stream_name_utf8);
+ new_ads_entry = inode_add_ads(dentry->inode, stream_name_utf8);
FREE(stream_name_utf8);
if (!new_ads_entry)
goto out_free_lte;
+
+ wimlib_assert(new_ads_entry->stream_name_len == name_length * 2);
new_ads_entry->lte = lte;
}
};
static int
-build_dentry_tree_ntfs_recursive(struct dentry **root_p, ntfs_inode *ni,
- char path[], size_t path_len,
+build_dentry_tree_ntfs_recursive(struct dentry **root_p, ntfs_inode *dir_ni,
+ ntfs_inode *ni, char path[], size_t path_len,
+ int name_type,
struct lookup_table *lookup_table,
struct sd_set *sd_set,
const struct capture_config *config,
ctx->path[path_len++] = '/';
memcpy(ctx->path + path_len, utf8_name, utf8_name_len + 1);
path_len += utf8_name_len;
- ret = build_dentry_tree_ntfs_recursive(&child, ni, ctx->path, path_len,
+ ret = build_dentry_tree_ntfs_recursive(&child, ctx->dir_ni,
+ ni, ctx->path, path_len, name_type,
ctx->lookup_table, ctx->sd_set,
ctx->config, ctx->ntfs_vol_p,
ctx->flags);
return ret;
}
+static int change_dentry_short_name(struct dentry *dentry,
+ const char short_name_utf8[],
+ int short_name_utf8_len)
+{
+ size_t short_name_utf16_len;
+ char *short_name_utf16;
+ short_name_utf16 = utf8_to_utf16(short_name_utf8, short_name_utf8_len,
+ &short_name_utf16_len);
+ if (!short_name_utf16) {
+ ERROR_WITH_ERRNO("Failed to convert short name to UTF-16");
+ return WIMLIB_ERR_NOMEM;
+ }
+ dentry->short_name = short_name_utf16;
+ dentry->short_name_len = short_name_utf16_len;
+ return 0;
+}
+
+/*#define HAVE_NTFS_INODE_FUNCTIONS*/
+
/* Recursively build a WIM dentry tree corresponding to a NTFS volume.
* At the same time, update the WIM lookup table with lookup table entries for
* the NTFS streams, and build an array of security descriptors.
*/
static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
+ ntfs_inode *dir_ni,
ntfs_inode *ni,
char path[],
size_t path_len,
+ int name_type,
struct lookup_table *lookup_table,
struct sd_set *sd_set,
const struct capture_config *config,
u32 attributes;
int mrec_flags;
u32 sd_size = 0;
- int ret = 0;
+ int ret;
+ char dos_name_utf8[64];
struct dentry *root;
mrec_flags = ni->mrec->flags;
- attributes = ntfs_inode_get_attributes(ni);
+#ifdef HAVE_NTFS_INODE_FUNCTIONS
+ attributes = ntfs_get_inode_attributes(ni);
+#else
+ struct SECURITY_CONTEXT ctx;
+ memset(&ctx, 0, sizeof(ctx));
+ ctx.vol = ni->vol;
+ ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ATTRIB,
+ ni, dir_ni, (char *)&attributes,
+ sizeof(u32));
+ if (ret != 4) {
+ ERROR_WITH_ERRNO("Failed to get NTFS attributes from `%s'",
+ path);
+ return WIMLIB_ERR_NTFS_3G;
+ }
+#endif
if (exclude_path(path, config, false)) {
if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) {
if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
printf("Scanning `%s'\n", path);
- root = new_dentry(path_basename(path));
+ root = new_dentry_with_inode(path_basename(path));
if (!root)
return WIMLIB_ERR_NOMEM;
-
*root_p = root;
- root->creation_time = le64_to_cpu(ni->creation_time);
- root->last_write_time = le64_to_cpu(ni->last_data_change_time);
- root->last_access_time = le64_to_cpu(ni->last_access_time);
- root->attributes = le32_to_cpu(attributes);
- root->link_group_id = ni->mft_no;
- root->resolved = true;
+
+ if (dir_ni && (name_type == FILE_NAME_WIN32_AND_DOS
+ || name_type == FILE_NAME_WIN32))
+ {
+ ret = ntfs_get_ntfs_dos_name(ni, dir_ni, dos_name_utf8,
+ sizeof(dos_name_utf8));
+ if (ret > 0) {
+ DEBUG("Changing short name of `%s'", path);
+ ret = change_dentry_short_name(root, dos_name_utf8,
+ ret);
+ if (ret != 0)
+ return ret;
+ } else {
+ #ifdef ENODATA
+ if (errno != ENODATA) {
+ ERROR_WITH_ERRNO("Error getting DOS name "
+ "of `%s'", path);
+ return WIMLIB_ERR_NTFS_3G;
+ }
+ #endif
+ }
+ }
+
+ root->inode->creation_time = le64_to_cpu(ni->creation_time);
+ root->inode->last_write_time = le64_to_cpu(ni->last_data_change_time);
+ root->inode->last_access_time = le64_to_cpu(ni->last_access_time);
+ root->inode->attributes = le32_to_cpu(attributes);
+ root->inode->ino = ni->mft_no;
+ root->inode->resolved = true;
if (attributes & FILE_ATTR_REPARSE_POINT) {
/* Junction point, symbolic link, or other reparse point */
if (ret != 0)
return ret;
- ret = ntfs_inode_get_security(ni,
+#ifdef HAVE_NTFS_INODE_FUNCTIONS
+ ret = ntfs_get_inode_security(ni,
OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
DACL_SECURITY_INFORMATION |
SACL_SECURITY_INFORMATION,
NULL, 0, &sd_size);
char sd[sd_size];
- ret = ntfs_inode_get_security(ni,
+ ret = ntfs_get_inode_security(ni,
OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
DACL_SECURITY_INFORMATION |
} else {
if (ret > 0) {
/*print_security_descriptor(sd, sd_size);*/
- root->security_id = sd_set_add_sd(sd_set, sd, sd_size);
+ root->security_id = sd_set_add_sd(sd_set, sd, ret);
if (root->security_id == -1) {
ERROR("Out of memory");
return WIMLIB_ERR_NOMEM;
}
ret = 0;
}
+#else
+ char _sd[1];
+ char *sd = _sd;
+ errno = 0;
+ ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
+ ni, dir_ni, sd,
+ sizeof(sd));
+ if (ret > sizeof(sd)) {
+ sd = alloca(ret);
+ ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
+ ni, dir_ni, sd, ret);
+ }
+ if (ret > 0) {
+ root->inode->security_id = sd_set_add_sd(sd_set, sd, ret);
+ if (root->inode->security_id == -1) {
+ ERROR("Out of memory");
+ return WIMLIB_ERR_NOMEM;
+ }
+ DEBUG("Added security ID = %u for `%s'",
+ root->inode->security_id, path);
+ ret = 0;
+ } else if (ret < 0) {
+ ERROR_WITH_ERRNO("Failed to get security information from "
+ "`%s'", path);
+ ret = WIMLIB_ERR_NTFS_3G;
+ } else {
+ root->inode->security_id = -1;
+ DEBUG("No security ID for `%s'", path);
+ }
+#endif
return ret;
}
path[0] = '/';
path[1] = '\0';
- ret = build_dentry_tree_ntfs_recursive(root_p, root_ni, path, 1,
- lookup_table, &sd_set,
- config, ntfs_vol_p, flags);
+ ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1,
+ FILE_NAME_POSIX, lookup_table,
+ &sd_set, config, ntfs_vol_p,
+ flags);
out_cleanup:
FREE(path);
ntfs_inode_close(root_ni);
git://wimlib.net / wimlib / blobdiff