/*
* ntfs-3g_capture.c
*
- * Capture a WIM image directly from a NTFS volume using libntfs-3g. We capture
+ * Capture a WIM image directly from an NTFS volume using libntfs-3g. We capture
* everything we can, including security data and alternate data streams.
*/
* dentry's inode. */
if (inode->i_lte) {
if (lte) {
- ERROR("Found two un-named data streams for \"%s\" "
- "(sizes = %"PRIu64", %"PRIu64")",
- path, inode->i_lte->size,
- lte->size);
- ret = WIMLIB_ERR_NTFS_3G;
- goto out_free_lte;
+ if (!(inode->i_attributes &
+ FILE_ATTRIBUTE_REPARSE_POINT))
+ {
+ WARNING("Found two un-named "
+ "data streams for \"%s\" "
+ "(sizes = %"PRIu64", "
+ "%"PRIu64")",
+ path,
+ inode->i_lte->size,
+ lte->size);
+ }
+ free_lookup_table_entry(lte);
+ continue;
}
} else {
stream_id = 0;
if (avl_tree_insert(&map->root, &new_node->index_node,
_avl_cmp_by_ntfs_ino))
{
- /* This should be impossible since a NTFS inode cannot
+ /* This should be impossible since an 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",
return 0;
}
-/* Returns a structure that contains the DOS name and its length for a NTFS
+/* Returns a structure that contains the DOS name and its length for an NTFS
* inode, or NULL if the inode has no DOS name. */
static struct dos_name_node *
lookup_dos_name(const struct dos_name_map *map, u64 ntfs_ino)
if (dentry->is_win32_name) {
node = lookup_dos_name(map, dentry->d_inode->i_ino);
if (node) {
- dentry->short_name = MALLOC(node->name_nbytes + 2);
+ dentry->short_name = utf16le_dupz((const utf16lechar *)node->dos_name,
+ node->name_nbytes);
if (!dentry->short_name)
return WIMLIB_ERR_NOMEM;
- memcpy(dentry->short_name, node->dos_name,
- node->name_nbytes);
- dentry->short_name[node->name_nbytes / 2] = 0;
dentry->short_name_nbytes = node->name_nbytes;
DEBUG("Assigned DOS name to ino %"PRIu64,
dentry->d_inode->i_ino);
return ret;
}
-/* Recursively build a WIM dentry tree corresponding to a NTFS volume.
+/* Recursively build a WIM dentry tree corresponding to an NTFS volume.
* At the same time, update the WIM lookup table with lookup table entries for
* the NTFS streams, and build an array of security descriptors.
*/
int ret;
struct wim_dentry *root = NULL;
struct wim_inode *inode = NULL;
- ATTR_TYPES stream_type;
- if (exclude_path(path, path_len, params->config, false)) {
+ if (should_exclude_path(path, path_len, params->config)) {
/* Exclude a file or directory tree based on the capture
* configuration file. */
ret = 0;
goto out;
}
params->progress.scan.cur_path = path;
- do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
- ret = 0;
+ ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
goto out;
}
/* Create a WIM dentry with an associated inode, which may be shared */
- ret = inode_table_new_dentry(¶ms->inode_table,
+ ret = inode_table_new_dentry(params->inode_table,
path_basename_with_len(path, path_len),
ni->mft_no, 0, false, &root);
if (ret)
inode->i_attributes = le32_to_cpu(attributes);
inode->i_resolved = 1;
- if (attributes & FILE_ATTR_REPARSE_POINT)
- stream_type = AT_REPARSE_POINT;
- else
- stream_type = AT_DATA;
+ /* Capture streams. */
+
+ if (attributes & FILE_ATTR_REPARSE_POINT) {
+ /* Capture reparse data stream. */
+ ret = capture_ntfs_streams(inode, ni, path, path_len,
+ params->unhashed_streams,
+ vol, AT_REPARSE_POINT);
+ if (ret)
+ goto out;
+ }
- /* Capture the file's streams; more specifically, this is supposed to:
+ /* Capture data streams.
+ *
+ * Directories should not have an unnamed data stream, but they may have
+ * named data streams.
+ *
+ * Reparse points may have an unnamed data stream (which will be ignored
+ * in favor of the reparse data stream), and they also may have named
+ * data streams.
*
- * - Regular files: capture unnamed data stream and any named data
- * streams
- * - Directories: capture any named data streams
- * - Reparse points: capture reparse data only
- */
+ * Regular files can have an unnamed data stream as well as named data
+ * streams. */
ret = capture_ntfs_streams(inode, ni, path, path_len,
- params->unhashed_streams, vol, stream_type);
+ params->unhashed_streams, vol, AT_DATA);
if (ret)
goto out;
ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, ret);
}
if (ret > 0) {
- inode->i_security_id = sd_set_add_sd(¶ms->sd_set,
+ inode->i_security_id = sd_set_add_sd(params->sd_set,
sd, ret);
if (inode->i_security_id == -1) {
ERROR("Out of memory");
out_progress:
params->progress.scan.cur_path = path;
if (root == NULL)
- do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
+ ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
else
- do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
+ ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
out:
if (ret == 0)
*root_ret = root;
git://wimlib.net / wimlib / blobdiff