X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-capture.c;h=3c9067079c2b8e2bf21d8a09ddb305a7a4ab4547;hb=5c0d30fbd73ee5e9f080d0763ec08eb68fe69314;hp=2656d1dd7f44afc40c57e782737d891232cabb71;hpb=bdc18020a46938f142bf39f10f9e0f1c9126cb0b;p=wimlib diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index 2656d1dd..3c906707 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -176,8 +176,8 @@ capture_ntfs_streams(struct wim_inode *inode, ATTR_TYPES type) { ntfs_attr_search_ctx *actx; - struct ntfs_location *ntfs_loc = NULL; - int ret = 0; + struct ntfs_location *ntfs_loc; + int ret; struct wim_lookup_table_entry *lte; DEBUG2("Capturing NTFS data streams from `%s'", path); @@ -199,27 +199,28 @@ capture_ntfs_streams(struct wim_inode *inode, u32 stream_id; if (data_size == 0) { - if (errno != 0) { - ERROR_WITH_ERRNO("Failed to get size of attribute of " - "`%s'", path); - ret = WIMLIB_ERR_NTFS_3G; - goto out_put_actx; - } /* Empty stream. No lookup table entry is needed. */ lte = NULL; + ntfs_loc = NULL; } else { ntfs_loc = CALLOC(1, sizeof(*ntfs_loc)); - if (!ntfs_loc) + if (!ntfs_loc) { + ret = WIMLIB_ERR_NOMEM; goto out_put_actx; + } ntfs_loc->ntfs_vol = vol; ntfs_loc->path = MALLOC(path_len + 1); - if (!ntfs_loc->path) + if (!ntfs_loc->path) { + ret = WIMLIB_ERR_NOMEM; goto out_free_ntfs_loc; + } memcpy(ntfs_loc->path, path, path_len + 1); if (name_length) { ntfs_loc->stream_name = MALLOC(name_length * 2); - if (!ntfs_loc->stream_name) + if (!ntfs_loc->stream_name) { + ret = WIMLIB_ERR_NOMEM; goto out_free_ntfs_loc; + } memcpy(ntfs_loc->stream_name, attr_record_name(actx->attr), actx->attr->name_length * 2); @@ -227,8 +228,10 @@ capture_ntfs_streams(struct wim_inode *inode, } lte = new_lookup_table_entry(); - if (!lte) + if (!lte) { + ret = WIMLIB_ERR_NOMEM; goto out_free_ntfs_loc; + } lte->resource_location = RESOURCE_IN_NTFS_VOLUME; lte->ntfs_loc = ntfs_loc; ntfs_loc = NULL; @@ -269,8 +272,10 @@ capture_ntfs_streams(struct wim_inode *inode, new_ads_entry = inode_add_ads_utf16le(inode, attr_record_name(actx->attr), name_length * 2); - if (!new_ads_entry) + if (!new_ads_entry) { + ret = WIMLIB_ERR_NOMEM; goto out_free_lte; + } wimlib_assert(new_ads_entry->stream_name_nbytes == name_length * 2); stream_id = new_ads_entry->stream_id; new_ads_entry->lte = lte; @@ -280,7 +285,13 @@ capture_ntfs_streams(struct wim_inode *inode, inode, stream_id); } } - ret = 0; + if (errno == ENOENT) { + ret = 0; + } else { + ERROR_WITH_ERRNO("Error listing NTFS attributes from `%s'", + path); + ret = WIMLIB_ERR_NTFS_3G; + } goto out_put_actx; out_free_lte: free_lookup_table_entry(lte); @@ -295,7 +306,7 @@ out_put_actx: if (ret == 0) DEBUG2("Successfully captured NTFS streams from `%s'", path); else - ERROR("Failed to capture NTFS streams from `%s", path); + ERROR("Failed to capture NTFS streams from `%s'", path); return ret; } @@ -430,14 +441,9 @@ struct readdir_ctx { ntfs_inode *dir_ni; char *path; size_t path_len; - struct wim_lookup_table *lookup_table; - struct wim_inode_table *inode_table; - struct sd_set *sd_set; struct dos_name_map *dos_name_map; - const struct wimlib_capture_config *config; ntfs_volume *vol; - int add_image_flags; - wimlib_progress_func_t progress_func; + struct add_image_params *params; }; static int @@ -447,13 +453,8 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, char *path, size_t path_len, int name_type, - struct wim_lookup_table *lookup_table, - struct wim_inode_table *inode_table, - struct sd_set *sd_set, - const struct wimlib_capture_config *config, ntfs_volume *ntfs_vol, - int add_image_flags, - wimlib_progress_func_t progress_func); + struct add_image_params *params); static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, @@ -512,12 +513,7 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, child = NULL; ret = build_dentry_tree_ntfs_recursive(&child, ctx->dir_ni, ni, ctx->path, path_len, name_type, - ctx->lookup_table, - ctx->inode_table, - ctx->sd_set, - ctx->config, ctx->vol, - ctx->add_image_flags, - ctx->progress_func); + ctx->vol, ctx->params); if (child) dentry_add_child(ctx->parent, child); ntfs_inode_close(ni); @@ -538,29 +534,25 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, char *path, size_t path_len, int name_type, - struct wim_lookup_table *lookup_table, - struct wim_inode_table *inode_table, - struct sd_set *sd_set, - const struct wimlib_capture_config *config, ntfs_volume *vol, - int add_image_flags, - wimlib_progress_func_t progress_func) + struct add_image_params *params) { u32 attributes; int ret; struct wim_dentry *root; struct wim_inode *inode; + ATTR_TYPES stream_type; - if (exclude_path(path, path_len, config, false)) { + if (exclude_path(path, path_len, params->config, false)) { /* Exclude a file or directory tree based on the capture * configuration file */ - if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE) - && progress_func) + if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE) + && params->progress_func) { union wimlib_progress_info info; info.scan.cur_path = path; info.scan.excluded = true; - progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); + params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } root = NULL; ret = 0; @@ -580,17 +572,17 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, return WIMLIB_ERR_NTFS_3G; } - if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) - && progress_func) + if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + && params->progress_func) { union wimlib_progress_info info; info.scan.cur_path = path; info.scan.excluded = false; - progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); + params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } /* Create a WIM dentry with an associated inode, which may be shared */ - ret = inode_table_new_dentry(inode_table, + ret = inode_table_new_dentry(params->inode_table, path_basename_with_len(path, path_len), ni->mft_no, 0, @@ -603,7 +595,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, if (inode->i_nlink > 1) /* Shared inode; nothing more to do */ goto out; - if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name */ + if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */ root->is_win32_name = 1; inode->i_creation_time = le64_to_cpu(ni->creation_time); inode->i_last_write_time = le64_to_cpu(ni->last_data_change_time); @@ -611,14 +603,26 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, inode->i_attributes = le32_to_cpu(attributes); inode->i_resolved = 1; - if (attributes & FILE_ATTR_REPARSE_POINT) { - /* Junction point, symbolic link, or other reparse point */ - ret = capture_ntfs_streams(inode, ni, path, - path_len, lookup_table, - vol, AT_REPARSE_POINT); - } else if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) { + if (attributes & FILE_ATTR_REPARSE_POINT) + stream_type = AT_REPARSE_POINT; + else + stream_type = AT_DATA; + + /* Capture the file's streams; more specifically, this is supposed to: + * + * - Regular files: capture unnamed data stream and any named data + * streams + * - Directories: capture any named data streams + * - Reparse points: capture reparse data only + */ + ret = capture_ntfs_streams(inode, ni, path, path_len, + params->lookup_table, vol, stream_type); + if (ret) + goto out; + + if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) { - /* Normal directory */ + /* Recurse to directory children */ s64 pos = 0; struct dos_name_map dos_name_map = { .rb_root = {.rb_node = NULL} }; struct readdir_ctx ctx = { @@ -626,14 +630,9 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, .dir_ni = ni, .path = path, .path_len = path_len, - .lookup_table = lookup_table, - .inode_table = inode_table, - .sd_set = sd_set, .dos_name_map = &dos_name_map, - .config = config, .vol = vol, - .add_image_flags = add_image_flags, - .progress_func = progress_func, + .params = params, }; ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir); if (ret) { @@ -644,16 +643,11 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, &dos_name_map); } destroy_dos_name_map(&dos_name_map); - } else { - /* Normal file */ - ret = capture_ntfs_streams(inode, ni, path, - path_len, lookup_table, - vol, AT_DATA); + if (ret) + goto out; } - if (ret) - goto out; - if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) { + if (!(params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) { /* Get security descriptor */ char _sd[1]; char *sd = _sd; @@ -667,7 +661,8 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, ni, dir_ni, sd, ret); } if (ret > 0) { - inode->i_security_id = sd_set_add_sd(sd_set, sd, ret); + inode->i_security_id = sd_set_add_sd(params->sd_set, + sd, ret); if (inode->i_security_id == -1) { ERROR("Out of memory"); ret = WIMLIB_ERR_NOMEM; @@ -689,7 +684,7 @@ out: if (ret == 0) *root_ret = root; else - free_dentry_tree(root, lookup_table); + free_dentry_tree(root, params->lookup_table); return ret; } @@ -707,13 +702,7 @@ do_ntfs_umount(struct _ntfs_volume *vol) int build_dentry_tree_ntfs(struct wim_dentry **root_p, const char *device, - struct wim_lookup_table *lookup_table, - struct wim_inode_table *inode_table, - struct sd_set *sd_set, - const struct wimlib_capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg) + struct add_image_params *params) { ntfs_volume *vol; ntfs_inode *root_ni; @@ -761,12 +750,7 @@ build_dentry_tree_ntfs(struct wim_dentry **root_p, path[0] = '/'; path[1] = '\0'; ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1, - FILE_NAME_POSIX, lookup_table, - inode_table, - sd_set, - config, vol, - add_image_flags, - progress_func); + FILE_NAME_POSIX, vol, params); out_cleanup: FREE(path); ntfs_inode_close(root_ni); @@ -785,7 +769,7 @@ out: } else { /* We need to leave the NTFS volume mounted so that we can read * the NTFS files again when we are actually writing the WIM */ - *(ntfs_volume**)extra_arg = vol; + *(ntfs_volume**)params->extra_arg = vol; } return ret; }