const char *p2;
size_t i;
- num_path_components = get_num_path_components(output_path) - 1;
+ num_path_components = get_num_path_components(dentry->_full_path) - 1;
num_output_dir_path_components = get_num_path_components(args->target);
if (args->extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) {
if (ret <= 0) {
ERROR("Could not read the symbolic link from dentry `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
return WIMLIB_ERR_INVALID_DENTRY;
}
ret = symlink(target, output_path);
if (dentry_is_root(dentry)) {
output_path = (tchar*)args->target;
} else {
- if (!dentry_full_path(dentry))
- return WIMLIB_ERR_NOMEM;
output_path = alloca(len * sizeof(tchar) + dentry->full_path_nbytes +
sizeof(tchar));
memcpy(output_path, args->target, len * sizeof(tchar));
if (dentry->is_extracted)
return 0;
- ret = calculate_dentry_full_path(dentry);
- if (ret)
- return ret;
-
if (args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS)
if (inode_unnamed_lte_resolved(dentry->d_inode))
return 0;
&args.progress);
}
+ ret = calculate_dentry_tree_full_paths(wim_root_dentry(w));
+ if (ret)
+ goto out;
+
/* Make the directory structure and extract empty files */
args.extract_flags |= WIMLIB_EXTRACT_FLAG_NO_STREAMS;
args.apply_dentry = ops->apply_dentry;
ret = for_dentry_in_tree(wim_root_dentry(w), maybe_apply_dentry, &args);
args.extract_flags &= ~WIMLIB_EXTRACT_FLAG_NO_STREAMS;
- if (ret != 0)
+ if (ret)
goto out;
if (progress_func) {
/* Extract non-empty files */
ret = apply_stream_list(&stream_list, &args, ops, progress_func);
- if (ret != 0)
+ if (ret)
goto out;
if (progress_func) {
/* Apply timestamps */
ret = for_dentry_in_tree_depth(wim_root_dentry(w),
ops->apply_dentry_timestamps, &args);
- if (ret != 0)
+ if (ret)
goto out;
if (progress_func) {
DEBUG("Writing %u NTFS data stream%s for `%s'",
inode->i_num_ads + 1,
(inode->i_num_ads == 0 ? "" : "s"),
- dentry_full_path(dentry));
+ dentry->_full_path);
lte = inode->i_lte;
while (1) {
ERROR_WITH_ERRNO("Failed to create named data "
"stream for extracted file "
"`%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
ret = WIMLIB_ERR_NTFS_3G;
break;
if (!na) {
ERROR_WITH_ERRNO("Failed to open a data stream of "
"extracted file `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
ret = WIMLIB_ERR_NTFS_3G;
break;
}
ntfs_inode *dir_ni;
char orig;
- if (!dentry_full_path(dentry))
- return NULL;
-
p = dentry->_full_path + dentry->full_path_nbytes;
do {
p--;
}
DEBUG("Extracting NTFS hard link `%s' => `%s'",
- dentry_full_path(from_dentry), inode->i_extracted_file);
+ from_dentry->_full_path, inode->i_extracted_file);
to_ni = ntfs_pathname_to_inode(vol, NULL, inode->i_extracted_file);
if (!to_ni) {
ret |= ntfs_inode_close(to_ni);
if (ret) {
ERROR_WITH_ERRNO("Could not create hard link `%s' => `%s'",
- dentry_full_path(from_dentry),
+ from_dentry->_full_path,
inode->i_extracted_file);
ret = WIMLIB_ERR_NTFS_3G;
}
inode = dentry->d_inode;
DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
- dentry_full_path(dentry), inode->i_attributes);
+ dentry->_full_path, inode->i_attributes);
attributes_le32 = cpu_to_le32(inode->i_attributes);
memset(&ctx, 0, sizeof(ctx));
sizeof(u32), 0);
if (ret != 0) {
ERROR("Failed to set NTFS file attributes on `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
return WIMLIB_ERR_NTFS_3G;
}
if (inode->i_security_id != -1 &&
wimlib_assert(inode->i_security_id < sd->num_entries);
desc = (const char *)sd->descriptors[inode->i_security_id];
DEBUG("Applying security descriptor %d to `%s'",
- inode->i_security_id, dentry_full_path(dentry));
+ inode->i_security_id, dentry->_full_path);
ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
ni, dir_ni, desc,
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to set security data on `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
return WIMLIB_ERR_NTFS_3G;
}
}
lte = inode_unnamed_lte_resolved(dentry->d_inode);
- DEBUG("Applying reparse data to `%s'", dentry_full_path(dentry));
+ DEBUG("Applying reparse data to `%s'", dentry->_full_path);
if (!lte) {
ERROR("Could not find reparse data for `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
return WIMLIB_ERR_INVALID_DENTRY;
}
if (wim_resource_size(lte) >= 0xffff) {
ERROR("Reparse data of `%s' is too long (%"PRIu64" bytes)",
- dentry_full_path(dentry), wim_resource_size(lte));
+ dentry->_full_path, wim_resource_size(lte));
return WIMLIB_ERR_INVALID_DENTRY;
}
wim_resource_size(lte) + 8, 0);
if (ret) {
ERROR_WITH_ERRNO("Failed to set NTFS reparse data on `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
return WIMLIB_ERR_NTFS_3G;
}
progress_info->extract.completed_bytes += wim_resource_size(lte);
* extracted yet, so go ahead and extract the
* first one. */
FREE(inode->i_extracted_file);
- const tchar *full_path = dentry_full_path(dentry);
+ const tchar *full_path = dentry->_full_path;
if (!full_path ||
!(inode->i_extracted_file = STRDUP(full_path)))
if (!ni) {
ERROR_WITH_ERRNO("Could not create NTFS inode for `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
ret = WIMLIB_ERR_NTFS_3G;
goto out_close_dir_ni;
}
goto out_close_dir_ni;
DEBUG("Setting short (DOS) name of `%s' to %s",
- dentry_full_path(dentry), short_name_mbs);
+ dentry->_full_path, short_name_mbs);
ret = ntfs_set_ntfs_dos_name(ni, dir_ni, short_name_mbs,
short_name_mbs_nbytes, 0);
FREE(short_name_mbs);
if (ret != 0) {
ERROR_WITH_ERRNO("Could not set DOS (short) name for `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
ret = WIMLIB_ERR_NTFS_3G;
}
/* inodes have been closed by ntfs_set_ntfs_dos_name(). */
if (ret == 0)
ret = WIMLIB_ERR_NTFS_3G;
ERROR_WITH_ERRNO("Failed to close inode for `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
}
}
if (ntfs_inode_close(dir_ni)) {
ret = WIMLIB_ERR_NTFS_3G;
ERROR_WITH_ERRNO("Failed to close inode of directory "
"containing `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
}
}
out:
ntfs_inode *ni;
int ret;
- DEBUG("Setting timestamps on `%s'", dentry_full_path(dentry));
+ DEBUG("Setting timestamps on `%s'", dentry->_full_path);
- ni = ntfs_pathname_to_inode(vol, NULL, dentry_full_path(dentry));
+ ni = ntfs_pathname_to_inode(vol, NULL, dentry->_full_path);
if (!ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
return WIMLIB_ERR_NTFS_3G;
}
ret = ntfs_inode_set_times(ni, (const char*)buf, 3 * sizeof(u64), 0);
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to set NTFS timestamps on `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
ret = WIMLIB_ERR_NTFS_3G;
}
if (ret == 0)
ret = WIMLIB_ERR_NTFS_3G;
ERROR_WITH_ERRNO("Failed to close NTFS inode for `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
}
return ret;
}