X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=11cbc9ddb9c288f28f59ad0f81b132a1d01d4b92;hp=d154fa9a710a2c6e0a23fb8a4e8b2c2f883fb6bf;hb=5d3d469e410dc5f4a28814ad231336fc174cba56;hpb=0ab938cc9554f3d5c6835c14b9177823e0e9b7bb diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c index d154fa9a..11cbc9dd 100644 --- a/src/ntfs-3g_capture.c +++ b/src/ntfs-3g_capture.c @@ -75,11 +75,8 @@ open_ntfs_attr(ntfs_inode *ni, struct ntfs_location *loc) } int -read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, - u64 size, - consume_data_callback_t cb, - void *ctx_or_buf, - int _ignored_flags) +read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, u64 size, + consume_data_callback_t cb, void *cb_ctx) { struct ntfs_location *loc = lte->ntfs_loc; ntfs_volume *vol = loc->ntfs_vol; @@ -87,10 +84,10 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, ntfs_attr *na; s64 pos; s64 bytes_remaining; - void *out_buf; int ret; + u8 buf[BUFFER_SIZE]; - ni = ntfs_pathname_to_inode(vol, NULL, loc->path); + ni = ntfs_pathname_to_inode(vol, NULL, loc->path); if (!ni) { ERROR_WITH_ERRNO("Can't find NTFS inode for \"%"TS"\"", loc->path); ret = WIMLIB_ERR_NTFS_3G; @@ -103,28 +100,20 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte, goto out_close_ntfs_inode; } - if (cb) - out_buf = alloca(WIM_CHUNK_SIZE); - else - out_buf = ctx_or_buf; pos = (loc->is_reparse_point) ? 8 : 0; bytes_remaining = size; while (bytes_remaining) { - s64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE); - if (ntfs_attr_pread(na, pos, to_read, out_buf) != to_read) { + s64 to_read = min(bytes_remaining, sizeof(buf)); + if (ntfs_attr_pread(na, pos, to_read, buf) != to_read) { ERROR_WITH_ERRNO("Error reading \"%"TS"\"", loc->path); ret = WIMLIB_ERR_NTFS_3G; goto out_close_ntfs_attr; } pos += to_read; bytes_remaining -= to_read; - if (cb) { - ret = cb(out_buf, to_read, ctx_or_buf); - if (ret) - goto out_close_ntfs_attr; - } else { - out_buf += to_read; - } + ret = cb(buf, to_read, cb_ctx); + if (ret) + goto out_close_ntfs_attr; } ret = 0; out_close_ntfs_attr: @@ -166,14 +155,13 @@ out: } -/* Load the streams from a file or reparse point in the NTFS volume into the WIM - * lookup table */ +/* Load the streams from a file or reparse point in the NTFS volume */ static int capture_ntfs_streams(struct wim_inode *inode, ntfs_inode *ni, char *path, size_t path_len, - struct wim_lookup_table *lookup_table, + struct list_head *unhashed_streams, ntfs_volume *vol, ATTR_TYPES type) { @@ -182,7 +170,7 @@ capture_ntfs_streams(struct wim_inode *inode, int ret; struct wim_lookup_table_entry *lte; - DEBUG2("Capturing NTFS data streams from `%s'", path); + DEBUG("Capturing NTFS data streams from `%s'", path); /* Get context to search the streams of the NTFS file. */ actx = ntfs_attr_get_search_ctx(ni, NULL); @@ -242,14 +230,14 @@ capture_ntfs_streams(struct wim_inode *inode, goto out_free_lte; } lte->ntfs_loc->is_reparse_point = true; - lte->resource_entry.original_size = data_size - 8; + lte->size = data_size - 8; ret = read_reparse_tag(ni, lte->ntfs_loc, &inode->i_reparse_tag); if (ret) goto out_free_lte; } else { lte->ntfs_loc->is_reparse_point = false; - lte->resource_entry.original_size = data_size; + lte->size = data_size; } } if (name_length == 0) { @@ -259,8 +247,8 @@ capture_ntfs_streams(struct wim_inode *inode, if (lte) { ERROR("Found two un-named data streams for \"%s\" " "(sizes = %"PRIu64", %"PRIu64")", - path, wim_resource_size(inode->i_lte), - wim_resource_size(lte)); + path, inode->i_lte->size, + lte->size); ret = WIMLIB_ERR_NTFS_3G; goto out_free_lte; } @@ -285,8 +273,8 @@ capture_ntfs_streams(struct wim_inode *inode, new_ads_entry->lte = lte; } if (lte) { - lookup_table_insert_unhashed(lookup_table, lte, - inode, stream_id); + add_unhashed_stream(lte, inode, + stream_id, unhashed_streams); } } if (errno == ENOENT) { @@ -307,7 +295,7 @@ out_free_ntfs_loc: out_put_actx: ntfs_attr_put_search_ctx(actx); if (ret == 0) - DEBUG2("Successfully captured NTFS streams from \"%s\"", path); + DEBUG("Successfully captured NTFS streams from \"%s\"", path); else ERROR("Failed to capture NTFS streams from \"%s\"", path); return ret; @@ -546,17 +534,14 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, le32 attributes; int ret; struct wim_dentry *root = NULL; - struct wim_inode *inode; + struct wim_inode *inode = NULL; ATTR_TYPES stream_type; - params->progress.scan.cur_path = path; - if (exclude_path(path, path_len, params->config, false)) { /* Exclude a file or directory tree based on the capture - * configuration file */ - do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED); + * configuration file. */ ret = 0; - goto out; + goto out_progress; } /* Get file attributes */ @@ -576,13 +561,12 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, ret = WIMLIB_ERR_UNSUPPORTED_FILE; goto out; } - do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED); + params->progress.scan.cur_path = path; + do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL); ret = 0; goto out; } - do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK); - /* Create a WIM dentry with an associated inode, which may be shared */ ret = inode_table_new_dentry(¶ms->inode_table, path_basename_with_len(path, path_len), @@ -598,7 +582,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, if (inode->i_nlink > 1) { /* Shared inode; nothing more to do */ ret = 0; - goto out; + goto out_progress; } inode->i_creation_time = le64_to_cpu(ni->creation_time); @@ -620,7 +604,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, * - Reparse points: capture reparse data only */ ret = capture_ntfs_streams(inode, ni, path, path_len, - params->lookup_table, vol, stream_type); + params->unhashed_streams, vol, stream_type); if (ret) goto out; @@ -649,6 +633,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, if (ret) goto out; } + path[path_len] = '\0'; /* Reparse-point fixups are a no-op because in NTFS-3g capture mode we * only allow capturing an entire volume. */ @@ -658,7 +643,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, if (!(params->add_flags & WIMLIB_ADD_FLAG_NO_ACLS)) { struct SECURITY_CONTEXT sec_ctx; - char _sd[1]; + char _sd[4096]; char *sd; /* Get security descriptor */ @@ -666,7 +651,8 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, sec_ctx.vol = vol; errno = 0; - ret = ntfs_get_ntfs_acl(&sec_ctx, ni, _sd, sizeof(_sd)); + sd = _sd; + ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, sizeof(_sd)); if (ret > sizeof(_sd)) { sd = alloca(ret); ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, ret); @@ -691,6 +677,15 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, DEBUG("No security ID for `%s'", path); } } + if (ret) + goto out; + +out_progress: + params->progress.scan.cur_path = path; + if (root == NULL) + do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL); + else + do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode); out: if (ret == 0) *root_ret = root;