* Returns 0 on success, nonzero on failure.
*/
static int
-write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
+write_ntfs_data_streams(ntfs_inode *ni, struct wim_dentry *dentry,
union wimlib_progress_info *progress_info)
{
int ret = 0;
DEBUG("Writing %u NTFS data stream%s for `%s'",
inode->i_num_ads + 1,
(inode->i_num_ads == 0 ? "" : "s"),
- dentry->full_path);
+ dentry_full_path(dentry));
lte = inode->i_lte;
while (1) {
ERROR_WITH_ERRNO("Failed to create named data "
"stream for extracted file "
"`%s'",
- dentry->full_path);
+ dentry_full_path(dentry));
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_full_path(dentry));
ret = WIMLIB_ERR_NTFS_3G;
break;
}
/* Open the NTFS inode that corresponds to the parent of a WIM dentry. Returns
* the opened inode, or NULL on failure. */
static ntfs_inode *
-dentry_open_parent_ni(const struct wim_dentry *dentry, ntfs_volume *vol)
+dentry_open_parent_ni(struct wim_dentry *dentry, ntfs_volume *vol)
{
char *p;
const char *dir_name;
ntfs_inode *dir_ni;
char orig;
- p = dentry->full_path + dentry->full_path_nbytes;
+ if (!dentry_full_path(dentry))
+ return NULL;
+
+ p = dentry->_full_path + dentry->full_path_nbytes;
do {
p--;
} while (*p != '/');
orig = *p;
*p = '\0';
- dir_name = dentry->full_path;
+ dir_name = dentry->_full_path;
dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name);
if (!dir_ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
* Return 0 on success, nonzero on failure. dir_ni is closed either way.
*/
static int
-apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
+apply_ntfs_hardlink(struct wim_dentry *from_dentry,
const struct wim_inode *inode,
ntfs_inode *dir_ni)
{
}
DEBUG("Extracting NTFS hard link `%s' => `%s'",
- from_dentry->full_path, inode->i_extracted_file);
+ dentry_full_path(from_dentry), 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'",
- from_dentry->full_path,
+ dentry_full_path(from_dentry),
inode->i_extracted_file);
ret = WIMLIB_ERR_NTFS_3G;
}
static int
apply_file_attributes_and_security_data(ntfs_inode *ni,
ntfs_inode *dir_ni,
- const struct wim_dentry *dentry,
+ struct wim_dentry *dentry,
const WIMStruct *w,
int extract_flags)
{
inode = dentry->d_inode;
DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
- dentry->full_path, inode->i_attributes);
+ dentry_full_path(dentry), 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_full_path(dentry));
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);
+ inode->i_security_id, dentry_full_path(dentry));
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_full_path(dentry));
return WIMLIB_ERR_NTFS_3G;
}
}
* point) to a NTFS inode.
*/
static int
-apply_reparse_data(ntfs_inode *ni, const struct wim_dentry *dentry,
+apply_reparse_data(ntfs_inode *ni, struct wim_dentry *dentry,
union wimlib_progress_info *progress_info)
{
struct wim_lookup_table_entry *lte;
lte = inode_unnamed_lte_resolved(dentry->d_inode);
- DEBUG("Applying reparse data to `%s'", dentry->full_path);
+ DEBUG("Applying reparse data to `%s'", dentry_full_path(dentry));
if (!lte) {
ERROR("Could not find reparse data for `%s'",
- dentry->full_path);
+ dentry_full_path(dentry));
return WIMLIB_ERR_INVALID_DENTRY;
}
if (wim_resource_size(lte) >= 0xffff) {
ERROR("Reparse data of `%s' is too long (%"PRIu64" bytes)",
- dentry->full_path, wim_resource_size(lte));
+ dentry_full_path(dentry), 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_full_path(dentry));
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);
- inode->i_extracted_file = STRDUP(dentry->full_path);
- if (!inode->i_extracted_file) {
+ const tchar *full_path = dentry_full_path(dentry);
+
+ if (!full_path ||
+ !(inode->i_extracted_file = STRDUP(full_path)))
+ {
ret = WIMLIB_ERR_NOMEM;
goto out_close_dir_ni;
}
if (!ni) {
ERROR_WITH_ERRNO("Could not create NTFS inode for `%s'",
- dentry->full_path);
+ dentry_full_path(dentry));
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, short_name_mbs);
+ dentry_full_path(dentry), 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_full_path(dentry));
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_full_path(dentry));
}
}
if (ntfs_inode_close(dir_ni)) {
if (ret == 0)
ret = WIMLIB_ERR_NTFS_3G;
ERROR_WITH_ERRNO("Failed to close inode of directory "
- "containing `%s'", dentry->full_path);
+ "containing `%s'",
+ dentry_full_path(dentry));
}
}
out:
}
static int
-apply_root_dentry_ntfs(const struct wim_dentry *dentry,
+apply_root_dentry_ntfs(struct wim_dentry *dentry,
ntfs_volume *vol, const WIMStruct *w,
int extract_flags)
{
ntfs_inode *ni;
int ret;
- DEBUG("Setting timestamps on `%s'", dentry->full_path);
+ DEBUG("Setting timestamps on `%s'", dentry_full_path(dentry));
- ni = ntfs_pathname_to_inode(vol, NULL, dentry->full_path);
+ ni = ntfs_pathname_to_inode(vol, NULL, dentry_full_path(dentry));
if (!ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
- dentry->full_path);
+ dentry_full_path(dentry));
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_full_path(dentry));
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_full_path(dentry));
}
return ret;
}