ATTR_TYPES type)
{
ntfs_attr_search_ctx *actx;
- struct ntfs_location *ntfs_loc = NULL;
- int ret = 0;
+ struct ntfs_location *ntfs_loc;
+ int ret;
struct wim_lookup_table_entry *lte;
DEBUG2("Capturing NTFS data streams from `%s'", path);
u32 stream_id;
if (data_size == 0) {
- if (errno != 0) {
- ERROR_WITH_ERRNO("Failed to get size of attribute of "
- "`%s'", path);
- ret = WIMLIB_ERR_NTFS_3G;
- goto out_put_actx;
- }
/* Empty stream. No lookup table entry is needed. */
lte = NULL;
+ ntfs_loc = NULL;
} else {
ntfs_loc = CALLOC(1, sizeof(*ntfs_loc));
- if (!ntfs_loc)
+ if (!ntfs_loc) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_put_actx;
+ }
ntfs_loc->ntfs_vol = vol;
ntfs_loc->path = MALLOC(path_len + 1);
- if (!ntfs_loc->path)
+ if (!ntfs_loc->path) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_ntfs_loc;
+ }
memcpy(ntfs_loc->path, path, path_len + 1);
if (name_length) {
ntfs_loc->stream_name = MALLOC(name_length * 2);
- if (!ntfs_loc->stream_name)
+ if (!ntfs_loc->stream_name) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_ntfs_loc;
+ }
memcpy(ntfs_loc->stream_name,
attr_record_name(actx->attr),
actx->attr->name_length * 2);
}
lte = new_lookup_table_entry();
- if (!lte)
+ if (!lte) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_ntfs_loc;
+ }
lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
lte->ntfs_loc = ntfs_loc;
ntfs_loc = NULL;
new_ads_entry = inode_add_ads_utf16le(inode,
attr_record_name(actx->attr),
name_length * 2);
- if (!new_ads_entry)
+ if (!new_ads_entry) {
+ ret = WIMLIB_ERR_NOMEM;
goto out_free_lte;
+ }
wimlib_assert(new_ads_entry->stream_name_nbytes == name_length * 2);
stream_id = new_ads_entry->stream_id;
new_ads_entry->lte = lte;
inode, stream_id);
}
}
- ret = 0;
+ if (errno == ENOENT) {
+ ret = 0;
+ } else {
+ ERROR_WITH_ERRNO("Error listing NTFS attributes from `%s'",
+ path);
+ ret = WIMLIB_ERR_NTFS_3G;
+ }
goto out_put_actx;
out_free_lte:
free_lookup_table_entry(lte);
if (ret == 0)
DEBUG2("Successfully captured NTFS streams from `%s'", path);
else
- ERROR("Failed to capture NTFS streams from `%s", path);
+ ERROR("Failed to capture NTFS streams from `%s'", path);
return ret;
}
int ret;
struct wim_dentry *root;
struct wim_inode *inode;
+ ATTR_TYPES stream_type;
if (exclude_path(path, path_len, config, false)) {
/* Exclude a file or directory tree based on the capture
if (inode->i_nlink > 1) /* Shared inode; nothing more to do */
goto out;
- if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name */
+ if (name_type & FILE_NAME_WIN32) /* Win32 or Win32+DOS name (rather than POSIX) */
root->is_win32_name = 1;
inode->i_creation_time = le64_to_cpu(ni->creation_time);
inode->i_last_write_time = le64_to_cpu(ni->last_data_change_time);
inode->i_attributes = le32_to_cpu(attributes);
inode->i_resolved = 1;
- if (attributes & FILE_ATTR_REPARSE_POINT) {
- /* Junction point, symbolic link, or other reparse point */
- ret = capture_ntfs_streams(inode, ni, path,
- path_len, lookup_table,
- vol, AT_REPARSE_POINT);
- } else if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
+ if (attributes & FILE_ATTR_REPARSE_POINT)
+ stream_type = AT_REPARSE_POINT;
+ else
+ stream_type = AT_DATA;
+
+ /* Capture the file's streams; more specifically, this is supposed to:
+ *
+ * - Regular files: capture unnamed data stream and any named data
+ * streams
+ * - Directories: capture any named data streams
+ * - Reparse points: capture reparse data only
+ */
+ ret = capture_ntfs_streams(inode, ni, path, path_len, lookup_table,
+ vol, stream_type);
+ if (ret)
+ goto out;
+
+ if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) {
- /* Normal directory */
+ /* Recurse to directory children */
s64 pos = 0;
struct dos_name_map dos_name_map = { .rb_root = {.rb_node = NULL} };
struct readdir_ctx ctx = {
&dos_name_map);
}
destroy_dos_name_map(&dos_name_map);
- } else {
- /* Normal file */
- ret = capture_ntfs_streams(inode, ni, path,
- path_len, lookup_table,
- vol, AT_DATA);
+ if (ret)
+ goto out;
}
- if (ret)
- goto out;
if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) {
/* Get security descriptor */