}
-/* 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;
}
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) {
le32 attributes;
int ret;
struct wim_dentry *root = NULL;
- struct wim_inode *inode;
+ 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. */
- params->progress.scan.cur_path = path;
- do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
ret = 0;
- goto out;
+ goto out_progress;
}
/* Get file attributes */
if (inode->i_nlink > 1) {
/* Shared inode; nothing more to do */
ret = 0;
- goto out_progress_ok;
+ 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;
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)
DEBUG("No security ID for `%s'", path);
}
}
+ if (ret)
+ goto out;
-out_progress_ok:
+out_progress:
params->progress.scan.cur_path = path;
- do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
+ 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;