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);
/* Capture each data stream or reparse data stream. */
while (!ntfs_attr_lookup(type, NULL, 0,
- CASE_SENSITIVE, 0, NULL, 0, actx))
+ WIMLIB_CASE_SENSITIVE, 0, NULL, 0, actx))
{
u64 data_size = ntfs_get_attribute_value_length(actx->attr);
u64 name_length = actx->attr->name_length;
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;
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);
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;