scan_ntfs_attr(struct wim_inode *inode,
ntfs_inode *ni,
const char *path,
- size_t path_len,
struct list_head *unhashed_blobs,
struct ntfs_volume_wrapper *volume,
ATTR_TYPES type,
scan_ntfs_attrs_with_type(struct wim_inode *inode,
ntfs_inode *ni,
const char *path,
- size_t path_len,
struct list_head *unhashed_blobs,
struct ntfs_volume_wrapper *volume,
ATTR_TYPES type)
ret = scan_ntfs_attr(inode,
ni,
path,
- path_len,
unhashed_blobs,
volume,
type,
goto out;
}
- /* Ignore . and .. entries */
- ret = 0;
- if ((name_nchars == 1 && name[0] == cpu_to_le16('.')) ||
- (name_nchars == 2 && name[0] == cpu_to_le16('.') &&
- name[1] == cpu_to_le16('.')))
- goto out;
-
ret = utf16le_to_tstr(name, name_nbytes, &mbs_name, &mbs_name_nbytes);
if (ret)
goto out;
+ if (should_ignore_filename(mbs_name, mbs_name_nbytes))
+ goto out_free_mbs_name;
+
path_len = ctx->path_len;
if (path_len != 1)
ctx->path[path_len++] = '/';
ret = ntfs_3g_build_dentry_tree_recursive(&child, mref, ctx->path,
path_len, name_type,
ctx->volume, ctx->params);
- if (child)
- dentry_add_child(ctx->parent, child);
+ attach_scanned_tree(ctx->parent, child, ctx->params->blob_table);
+out_free_mbs_name:
FREE(mbs_name);
out:
ctx->ret = ret;
if (attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
/* Scan the reparse point stream. */
- ret = scan_ntfs_attrs_with_type(inode, ni, path, path_len,
+ ret = scan_ntfs_attrs_with_type(inode, ni, path,
params->unhashed_blobs,
volume, AT_REPARSE_POINT);
if (ret)
* may have named data streams. Nondirectories (including reparse
* points) can have an unnamed data stream as well as named data
* streams. */
- ret = scan_ntfs_attrs_with_type(inode, ni, path, path_len,
- params->unhashed_blobs,
+ ret = scan_ntfs_attrs_with_type(inode, ni, path, params->unhashed_blobs,
volume, AT_DATA);
if (ret)
goto out;