Cleanup

[wimlib] / src / ntfs-3g_capture.c

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index d154fa9a710a2c6e0a23fb8a4e8b2c2f883fb6bf..b6d9226276e7afe44f4d1ce3ad50a93933ad7c9a 100644 (file)
--- 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:
@@ -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;
                                }
@@ -658,7 +647,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 +655,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);