X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-capture.c;h=6751754782e8a1782985930f7df3defe25f17e1e;hp=4ea23048b5404c21ee8fc65a80ab3bd09029d04f;hb=63a5804943519281f206ca0fefacfe2b99fc9958;hpb=e901f5bc2e56a930ac71c545586aaf70b0fd2b56 diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index 4ea23048..67517547 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -24,7 +24,14 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ + #include "config.h" + +#ifdef WITH_NTFS_3G +#include +#include +#endif + #include "wimlib_internal.h" @@ -37,13 +44,14 @@ #include #include #include -#include +#include /* security.h before xattrs.h */ +#include #include #include #include #include -#ifndef WITH_NEW_NTFS_3G +#if 0 extern int ntfs_get_inode_security(ntfs_inode *ni, u32 selection, char *buf, u32 buflen, u32 *psize); @@ -287,7 +295,8 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, 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; } @@ -327,7 +336,7 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, 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; @@ -346,14 +355,14 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, } 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 */ @@ -364,7 +373,7 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, &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; @@ -406,8 +415,9 @@ struct readdir_ctx { }; 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, @@ -455,7 +465,8 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, 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); @@ -470,14 +481,35 @@ out: 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, @@ -487,11 +519,26 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, 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; +#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) { @@ -510,17 +557,39 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, 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 */ @@ -556,6 +625,7 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, if (ret != 0) return ret; +#ifdef HAVE_NTFS_INODE_FUNCTIONS ret = ntfs_get_inode_security(ni, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | @@ -576,7 +646,7 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, } 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; @@ -589,6 +659,36 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, } 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; } @@ -643,9 +743,10 @@ static int build_dentry_tree_ntfs(struct dentry **root_p, 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);