X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-capture.c;h=03c8720af1e568686e444e2bbfe5ec72f08a92cf;hp=da7944809c9c1817575634491e8881cb4a16d08c;hb=237947e198385359a0c618b664d73bf4db36c405;hpb=541b65d79e0c73238a25e2c2661711d8593d0684 diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index da794480..03c8720a 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -121,7 +121,7 @@ out_error: static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni, - mbchar *path, + char *path, size_t path_len, struct wim_lookup_table *lookup_table, ntfs_volume **ntfs_vol_p, @@ -391,7 +391,7 @@ destroy_dos_name_map(struct dos_name_map *map) struct readdir_ctx { struct wim_dentry *parent; ntfs_inode *dir_ni; - mbchar *path; + char *path; size_t path_len; struct wim_lookup_table *lookup_table; struct sd_set *sd_set; @@ -406,7 +406,7 @@ static int build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, ntfs_inode *dir_ni, ntfs_inode *ni, - mbchar *path, + char *path, size_t path_len, int name_type, struct wim_lookup_table *lookup_table, @@ -424,7 +424,7 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, { struct readdir_ctx *ctx; size_t mbs_name_nbytes; - mbchar *mbs_name; + char *mbs_name; struct wim_dentry *child; int ret; size_t path_len; @@ -441,8 +441,8 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, if (ret != 0 || name_type == FILE_NAME_DOS) goto out; } - ret = utf16le_to_mbs(name, name_nbytes, - &mbs_name, &mbs_name_nbytes); + ret = utf16le_to_tstr(name, name_nbytes, + &mbs_name, &mbs_name_nbytes); if (ret) goto out; @@ -494,7 +494,7 @@ static int build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, ntfs_inode *dir_ni, ntfs_inode *ni, - mbchar *path, + char *path, size_t path_len, int name_type, struct wim_lookup_table *lookup_table, @@ -508,10 +508,10 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, int ret; struct wim_dentry *root; - if (exclude_path(path, config, false)) { + if (exclude_path(path, path_len, config, false)) { /* Exclude a file or directory tree based on the capture * configuration file */ - if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE) && progress_func) { union wimlib_progress_info info; @@ -546,7 +546,8 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, } /* Create the new WIM dentry */ - ret = new_dentry_with_timeless_inode(path_basename(path), &root); + ret = new_dentry_with_timeless_inode(path_basename_with_len(path, path_len), + &root); if (ret) return ret; @@ -602,43 +603,45 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, if (ret != 0) return ret; - /* Get security descriptor */ - 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); + if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) { + /* Get security descriptor */ + char _sd[1]; + char *sd = _sd; + errno = 0; ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL, - ni, dir_ni, sd, ret); - } - if (ret > 0) { - root->d_inode->i_security_id = sd_set_add_sd(sd_set, sd, ret); - if (root->d_inode->i_security_id == -1) { - ERROR("Out of memory"); - return WIMLIB_ERR_NOMEM; + 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->d_inode->i_security_id = sd_set_add_sd(sd_set, sd, ret); + if (root->d_inode->i_security_id == -1) { + ERROR("Out of memory"); + return WIMLIB_ERR_NOMEM; + } + DEBUG("Added security ID = %u for `%s'", + root->d_inode->i_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->d_inode->i_security_id = -1; + DEBUG("No security ID for `%s'", path); } - DEBUG("Added security ID = %u for `%s'", - root->d_inode->i_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->d_inode->i_security_id = -1; - DEBUG("No security ID for `%s'", path); } return ret; } int build_dentry_tree_ntfs(struct wim_dentry **root_p, - const mbchar *device, + const char *device, struct wim_lookup_table *lookup_table, - struct wim_security_data *sd, + struct sd_set *sd_set, const struct capture_config *config, int add_image_flags, wimlib_progress_func_t progress_func, @@ -647,10 +650,6 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p, ntfs_volume *vol; ntfs_inode *root_ni; int ret; - struct sd_set sd_set = { - .sd = sd, - .rb_root = {NULL}, - }; ntfs_volume **ntfs_vol_p = extra_arg; DEBUG("Mounting NTFS volume `%s' read-only", device); @@ -685,7 +684,7 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p, /* Currently we assume that all the paths fit into this length and there * is no check for overflow. */ - mbchar *path = MALLOC(32768); + char *path = MALLOC(32768); if (!path) { ERROR("Could not allocate memory for NTFS pathname"); ret = WIMLIB_ERR_NOMEM; @@ -696,14 +695,13 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p, path[1] = '\0'; ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1, FILE_NAME_POSIX, lookup_table, - &sd_set, + sd_set, config, ntfs_vol_p, add_image_flags, progress_func); out_cleanup: FREE(path); ntfs_inode_close(root_ni); - destroy_sd_set(&sd_set); out: ntfs_index_ctx_put(vol->secure_xsii); ntfs_index_ctx_put(vol->secure_xsdh);