*/
/*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012, 2013, 2014 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
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;
}
-/* 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)
{
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);
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) {
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;
}
-/* Red-black tree that maps NTFS inode numbers to DOS names */
+/* Binary tree that maps NTFS inode numbers to DOS names */
struct dos_name_map {
- struct rb_root rb_root;
+ struct avl_tree_node *root;
};
struct dos_name_node {
- struct rb_node rb_node;
+ struct avl_tree_node index_node;
char dos_name[24];
int name_nbytes;
le64 ntfs_ino;
};
+#define DOS_NAME_NODE(avl_node) \
+ avl_tree_entry(avl_node, struct dos_name_node, index_node)
+
+static int
+_avl_cmp_by_ntfs_ino(const struct avl_tree_node *n1,
+ const struct avl_tree_node *n2)
+{
+ return cmp_u64(DOS_NAME_NODE(n1)->ntfs_ino,
+ DOS_NAME_NODE(n2)->ntfs_ino);
+}
+
/* Inserts a new DOS name into the map */
static int
insert_dos_name(struct dos_name_map *map, const ntfschar *dos_name,
size_t name_nbytes, le64 ntfs_ino)
{
struct dos_name_node *new_node;
- struct rb_node **p;
- struct rb_root *root;
- struct rb_node *rb_parent;
DEBUG("DOS name_len = %zu", name_nbytes);
new_node = MALLOC(sizeof(struct dos_name_node));
wimlib_assert(name_nbytes <= sizeof(new_node->dos_name));
/* Initialize the DOS name, DOS name length, and NTFS inode number of
- * the red-black tree node */
+ * the search tree node */
memcpy(new_node->dos_name, dos_name, name_nbytes);
new_node->name_nbytes = name_nbytes;
new_node->ntfs_ino = ntfs_ino;
- /* Insert the red-black tree node */
- root = &map->rb_root;
- p = &root->rb_node;
- rb_parent = NULL;
- while (*p) {
- struct dos_name_node *this;
-
- this = container_of(*p, struct dos_name_node, rb_node);
- rb_parent = *p;
- if (new_node->ntfs_ino < this->ntfs_ino)
- p = &((*p)->rb_left);
- else if (new_node->ntfs_ino > this->ntfs_ino)
- p = &((*p)->rb_right);
- else {
- /* This should be impossible since a NTFS inode cannot
- * have multiple DOS names, and we only should get each
- * DOS name entry once from the ntfs_readdir() calls. */
- ERROR("NTFS inode %"PRIu64" has multiple DOS names",
- le64_to_cpu(ntfs_ino));
- return -1;
- }
+ /* Insert the search tree node */
+ if (avl_tree_insert(&map->root, &new_node->index_node,
+ _avl_cmp_by_ntfs_ino))
+ {
+ /* This should be impossible since a NTFS inode cannot
+ * have multiple DOS names, and we only should get each
+ * DOS name entry once from the ntfs_readdir() calls. */
+ ERROR("NTFS inode %"PRIu64" has multiple DOS names",
+ le64_to_cpu(ntfs_ino));
+ FREE(new_node);
+ return -1;
}
- rb_link_node(&new_node->rb_node, rb_parent, p);
- rb_insert_color(&new_node->rb_node, root);
DEBUG("Inserted DOS name for inode %"PRIu64, le64_to_cpu(ntfs_ino));
return 0;
}
static struct dos_name_node *
lookup_dos_name(const struct dos_name_map *map, u64 ntfs_ino)
{
- struct rb_node *node = map->rb_root.rb_node;
- while (node) {
- struct dos_name_node *this;
- this = container_of(node, struct dos_name_node, rb_node);
- if (ntfs_ino < this->ntfs_ino)
- node = node->rb_left;
- else if (ntfs_ino > this->ntfs_ino)
- node = node->rb_right;
- else
- return this;
- }
- return NULL;
+ struct dos_name_node dummy;
+ struct avl_tree_node *res;
+
+ dummy.ntfs_ino = cpu_to_le64(ntfs_ino);
+
+ res = avl_tree_lookup_node(map->root, &dummy.index_node,
+ _avl_cmp_by_ntfs_ino);
+ if (!res)
+ return NULL;
+ return DOS_NAME_NODE(res);
}
static int
-set_dentry_dos_name(struct wim_dentry *dentry, void *arg)
+set_dentry_dos_name(struct wim_dentry *dentry, const struct dos_name_map *map)
{
- const struct dos_name_map *map = arg;
const struct dos_name_node *node;
if (dentry->is_win32_name) {
}
static void
-free_dos_name_tree(struct rb_node *node) {
+free_dos_name_tree(struct avl_tree_node *node) {
if (node) {
- free_dos_name_tree(node->rb_left);
- free_dos_name_tree(node->rb_right);
- FREE(container_of(node, struct dos_name_node, rb_node));
+ free_dos_name_tree(node->left);
+ free_dos_name_tree(node->right);
+ FREE(DOS_NAME_NODE(node));
}
}
static void
destroy_dos_name_map(struct dos_name_map *map)
{
- free_dos_name_tree(map->rb_root.rb_node);
+ free_dos_name_tree(map->root);
}
struct readdir_ctx {
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 */
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),
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);
* - 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;
/* Recurse to directory children */
s64 pos = 0;
- struct dos_name_map dos_name_map = { .rb_root = {.rb_node = NULL} };
+ struct dos_name_map dos_name_map = { .root = NULL };
struct readdir_ctx ctx = {
.parent = root,
.path = path,
ERROR_WITH_ERRNO("Error reading directory \"%s\"", path);
ret = WIMLIB_ERR_NTFS_3G;
} else {
- ret = for_dentry_child(root, set_dentry_dos_name,
- &dos_name_map);
+ struct wim_dentry *child;
+
+ ret = 0;
+ for_dentry_child(child, root) {
+ ret = set_dentry_dos_name(child, &dos_name_map);
+ if (ret)
+ break;
+ }
}
destroy_dos_name_map(&dos_name_map);
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. */
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;