Reviewed code in dentry.c and {read,write}_metadata_resource()

[wimlib] / src / ntfs-capture.c

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index 5d8ebcf8c27e5473292ff925c09aa42f5dc41780..43caec0e9668634d63b74c62c0c98c5c1146c0ec 100644 (file)
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -63,15 +63,19 @@ struct sd_node {
        struct sd_node *right;
 };
 
-/* Frees a security descriptor index tree. */
-static void free_sd_set(struct sd_node *root)
+static void free_sd_tree(struct sd_node *root)
 {
        if (root) {
-               free_sd_set(root->left);
-               free_sd_set(root->right);
+               free_sd_tree(root->left);
+               free_sd_tree(root->right);
                FREE(root);
        }
 }
+/* Frees a security descriptor index set. */
+static void destroy_sd_set(struct sd_set *sd_set)
+{
+       free_sd_tree(sd_set->root);
+}
 
 /* Inserts a a new node into the security descriptor index tree. */
 static void insert_sd_node(struct sd_node *new, struct sd_node *root)
@@ -297,6 +301,9 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
                        lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
                        lte->resource_entry.original_size = actx->attr->data_size;
                        lte->resource_entry.size = actx->attr->data_size;
+                       DEBUG("Add resource for `%s' (size = %zu)",
+                               dentry->file_name_utf8,
+                               lte->resource_entry.original_size);
                        copy_hash(lte->hash, attr_hash);
                        lookup_table_insert(lookup_table, lte);
                }
@@ -369,10 +376,13 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
        struct readdir_ctx *ctx;
        size_t utf8_name_len;
        char *utf8_name;
-       struct dentry *child;
+       struct dentry *child = NULL;
        int ret;
        size_t path_len;
 
+       if (name_type == FILE_NAME_DOS)
+               return 0;
+
        ret = -1;
 
        utf8_name = utf16_to_utf8((const u8*)name, name_len * 2,
@@ -405,11 +415,12 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
        ret = __build_dentry_tree_ntfs(&child, ni, ctx->path, path_len,
                                       ctx->lookup_table, ctx->sd_set,
                                       ctx->config, ctx->ntfs_vol_p);
-       DEBUG("Linking dentry `%s' with parent `%s'",
-             child->file_name_utf8, ctx->parent->file_name_utf8);
 
-       link_dentry(child, ctx->parent);
-       DEBUG("Return %d", ret);
+       if (child) {
+               DEBUG("Linking dentry `%s' with parent `%s'",
+                     child->file_name_utf8, ctx->parent->file_name_utf8);
+               link_dentry(child, ctx->parent);
+       }
 out_close_ni:
        ntfs_inode_close(ni);
 out_free_utf8_name:
@@ -448,6 +459,7 @@ static int __build_dentry_tree_ntfs(struct dentry **root_p, ntfs_inode *ni,
        if (!root)
                return WIMLIB_ERR_NOMEM;
 
+       *root_p = root;
        root->creation_time    = le64_to_cpu(ni->creation_time);
        root->last_write_time  = le64_to_cpu(ni->last_data_change_time);
        root->last_access_time = le64_to_cpu(ni->last_access_time);
@@ -478,8 +490,10 @@ static int __build_dentry_tree_ntfs(struct dentry **root_p, ntfs_inode *ni,
                        .ntfs_vol_p   = ntfs_vol_p,
                };
                ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir);
-               if (ret != 0)
+               if (ret != 0) {
+                       ERROR_WITH_ERRNO("ntfs_readdir()");
                        ret = WIMLIB_ERR_NTFS_3G;
+               }
        } else {
                DEBUG("Normal file `%s'", path);
                /* Normal file */
@@ -490,7 +504,6 @@ static int __build_dentry_tree_ntfs(struct dentry **root_p, ntfs_inode *ni,
        if (ret != 0)
                return ret;
 
-       DEBUG("Getting security information from `%s'", path);
        ret = ntfs_inode_get_security(ni,
                                      OWNER_SECURITY_INFORMATION |
                                      GROUP_SECURITY_INFORMATION |
@@ -520,7 +533,6 @@ static int __build_dentry_tree_ntfs(struct dentry **root_p, ntfs_inode *ni,
                }
                ret = 0;
        }
-       *root_p = root;
        return ret;
 }
 
@@ -535,9 +547,9 @@ static int build_dentry_tree_ntfs(struct dentry **root_p,
        ntfs_volume *vol;
        ntfs_inode *root_ni;
        int ret = 0;
-       struct sd_set tree;
-       tree.sd = sd;
-       tree.root = NULL;
+       struct sd_set sd_set;
+       sd_set.sd = sd;
+       sd_set.root = NULL;
        ntfs_volume **ntfs_vol_p = extra_arg;
 
        DEBUG("Mounting NTFS volume `%s' read-only", device);
@@ -563,15 +575,21 @@ static int build_dentry_tree_ntfs(struct dentry **root_p,
        path[0] = '/';
        path[1] = '\0';
        ret = __build_dentry_tree_ntfs(root_p, root_ni, path, 1,
-                                      lookup_table, &tree, config,
+                                      lookup_table, &sd_set, config,
                                       ntfs_vol_p);
        ntfs_inode_close(root_ni);
+       destroy_sd_set(&sd_set);
 
 out:
-       if (ntfs_umount(vol, FALSE) != 0) {
-               ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device);
-               if (ret == 0)
-                       ret = WIMLIB_ERR_NTFS_3G;
+       if (ret) {
+               if (ntfs_umount(vol, FALSE) != 0) {
+                       ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'",
+                                        device);
+                       if (ret == 0)
+                               ret = WIMLIB_ERR_NTFS_3G;
+               }
+       } else {
+               *ntfs_vol_p = vol;
        }
        return ret;
 }