Refactor some of the dentry, inode, and lookup table code

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

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 7a07cd3efe24a9a853d3dfc44c44e3fc3ca077d3..11cbc9ddb9c288f28f59ad0f81b132a1d01d4b92 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 *cb_ctx,
-                     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;
@@ -90,7 +87,7 @@ read_ntfs_file_prefix(const struct wim_lookup_table_entry *lte,
        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;
@@ -158,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)
 {
@@ -174,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);
@@ -277,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) {
@@ -299,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;
@@ -538,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 */
@@ -568,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(&params->inode_table,
                                     path_basename_with_len(path, path_len),
@@ -590,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);
@@ -612,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;
 
@@ -641,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. */
@@ -684,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;