X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=c26ca605382d86c970d5ce9cb4f226795b84e862;hp=27c446a05b3a787c6c51ac2314fdef5cb93f5b61;hb=3bb3e3c3806a121686cec80c56f2718c714915ef;hpb=9db1bdc721081a2dead6a60cba77dfb9bdad5ceb diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c index 27c446a0..c26ca605 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: @@ -182,7 +171,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); @@ -194,7 +183,7 @@ capture_ntfs_streams(struct wim_inode *inode, /* Capture each data stream or reparse data stream. */ while (!ntfs_attr_lookup(type, NULL, 0, - CASE_SENSITIVE, 0, NULL, 0, actx)) + WIMLIB_CASE_SENSITIVE, 0, NULL, 0, actx)) { u64 data_size = ntfs_get_attribute_value_length(actx->attr); u64 name_length = actx->attr->name_length; @@ -242,14 +231,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 +248,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; } @@ -307,7 +296,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; @@ -545,72 +534,57 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, { le32 attributes; int ret; - struct wim_dentry *root; - struct wim_inode *inode; + struct wim_dentry *root = NULL; + struct wim_inode *inode = NULL; ATTR_TYPES stream_type; if (exclude_path(path, path_len, params->config, false)) { /* Exclude a file or directory tree based on the capture - * configuration file */ - if ((params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE) - && params->progress_func) - { - union wimlib_progress_info info; - info.scan.cur_path = path; - info.scan.status = WIMLIB_SCAN_DENTRY_EXCLUDED; - params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); - } - root = NULL; + * configuration file. */ ret = 0; - goto out; + goto out_progress; } /* Get file attributes */ ret = ntfs_get_ntfs_attrib(ni, (char*)&attributes, sizeof(attributes)); if (ret != sizeof(attributes)) { ERROR_WITH_ERRNO("Failed to get NTFS attributes from \"%s\"", path); - return WIMLIB_ERR_NTFS_3G; + ret = WIMLIB_ERR_NTFS_3G; + goto out; } if ((attributes & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ENCRYPTED)) == FILE_ATTRIBUTE_ENCRYPTED) { - if ((params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE) - && params->progress_func) + if (params->add_flags & WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE) { - union wimlib_progress_info info; - info.scan.cur_path = path; - info.scan.status = WIMLIB_SCAN_DENTRY_UNSUPPORTED; - params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); + ERROR("Can't archive unsupported encrypted file \"%s\"", path); + ret = WIMLIB_ERR_UNSUPPORTED_FILE; + goto out; } - root = NULL; + params->progress.scan.cur_path = path; + do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL); ret = 0; goto out; } - if ((params->add_flags & WIMLIB_ADD_FLAG_VERBOSE) - && params->progress_func) - { - union wimlib_progress_info info; - info.scan.cur_path = path; - info.scan.status = WIMLIB_SCAN_DENTRY_OK; - 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(¶ms->inode_table, path_basename_with_len(path, path_len), ni->mft_no, 0, false, &root); if (ret) - return ret; + goto out; if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */ root->is_win32_name = 1; inode = root->d_inode; - if (inode->i_nlink > 1) /* Shared inode; nothing more to do */ - goto out; + if (inode->i_nlink > 1) { + /* Shared inode; nothing more to do */ + ret = 0; + goto out_progress; + } inode->i_creation_time = le64_to_cpu(ni->creation_time); inode->i_last_write_time = le64_to_cpu(ni->last_data_change_time); @@ -660,6 +634,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. */ @@ -669,7 +644,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 */ @@ -677,7 +652,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); @@ -702,6 +678,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;