X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-apply.c;h=0297e7245f9037d18eb46dcb22b004e93fcdd4e9;hb=fcc8d33acee4c9ab11ebe975da030c6e53b182e3;hp=19c784586ce4c41cca855bddfa87cbf70848e479;hpb=13c6ce3160fce7c40008d1d182325c8b42450d1e;p=wimlib diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index 19c78458..0297e724 100644 --- a/src/ntfs-apply.c +++ b/src/ntfs-apply.c @@ -102,16 +102,22 @@ write_ntfs_data_streams(ntfs_inode *ni, struct wim_dentry *dentry, const struct wim_inode *inode = dentry->d_inode; struct wim_lookup_table_entry *lte; + lte = inode->i_lte; + + /* For directories, skip unnamed streams; just extract alternate data + * streams. */ + if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) + goto cont; + 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) { + for (;;) { if (stream_name_nbytes) { /* Skip special UNIX data entries (see documentation for - * WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) */ + * WIMLIB_ADD_FLAG_UNIX_DATA) */ if (stream_name_nbytes == WIMLIB_UNIX_DATA_TAG_UTF16LE_NBYTES && !memcmp(stream_name, WIMLIB_UNIX_DATA_TAG_UTF16LE, @@ -121,11 +127,11 @@ write_ntfs_data_streams(ntfs_inode *ni, struct wim_dentry *dentry, /* Create an empty named stream. */ ret = ntfs_attr_add(ni, AT_DATA, stream_name, stream_name_nbytes / 2, NULL, 0); - if (ret != 0) { + if (ret) { 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; @@ -142,7 +148,7 @@ write_ntfs_data_streams(ntfs_inode *ni, struct wim_dentry *dentry, 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; } @@ -151,7 +157,7 @@ write_ntfs_data_streams(ntfs_inode *ni, struct wim_dentry *dentry, * length, so the NTFS attribute should be resized to * this length before starting to extract the data. */ ret = ntfs_attr_truncate_solid(na, wim_resource_size(lte)); - if (ret != 0) { + if (ret) { ntfs_attr_close(na); break; } @@ -161,7 +167,7 @@ write_ntfs_data_streams(ntfs_inode *ni, struct wim_dentry *dentry, /* Close the attribute */ ntfs_attr_close(na); - if (ret != 0) + if (ret) break; /* Record the number of bytes of uncompressed data that @@ -191,9 +197,6 @@ dentry_open_parent_ni(struct wim_dentry *dentry, ntfs_volume *vol) ntfs_inode *dir_ni; char orig; - if (!dentry_full_path(dentry)) - return NULL; - p = dentry->_full_path + dentry->full_path_nbytes; do { p--; @@ -243,7 +246,7 @@ apply_ntfs_hardlink(struct wim_dentry *from_dentry, } 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) { @@ -265,7 +268,7 @@ apply_ntfs_hardlink(struct wim_dentry *from_dentry, 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; } @@ -298,7 +301,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, 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)); @@ -307,13 +310,12 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, ni, dir_ni, (const char*)&attributes_le32, sizeof(u32), 0); - if (ret != 0) { + if (ret) { ERROR("Failed to set NTFS file attributes on `%s'", - dentry_full_path(dentry)); - return WIMLIB_ERR_NTFS_3G; - } - if (inode->i_security_id != -1 && - !(extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS)) + dentry->_full_path); + ret = WIMLIB_ERR_NTFS_3G; + } else if (inode->i_security_id != -1 && + !(extract_flags & WIMLIB_EXTRACT_FLAG_NO_ACLS)) { const char *desc; const struct wim_security_data *sd; @@ -322,19 +324,19 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, 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, sd->sizes[inode->i_security_id], 0); - if (ret != 0) { + if (ret) { ERROR_WITH_ERRNO("Failed to set security data on `%s'", - dentry_full_path(dentry)); - return WIMLIB_ERR_NTFS_3G; + dentry->_full_path); + ret = WIMLIB_ERR_NTFS_3G; } } - return 0; + return ret; } /* @@ -346,21 +348,23 @@ apply_reparse_data(ntfs_inode *ni, struct wim_dentry *dentry, union wimlib_progress_info *progress_info) { struct wim_lookup_table_entry *lte; - int ret = 0; + int ret; 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) { + /* "Reparse point data, including the tag and optional GUID, cannot + * exceed 16 kilobytes." - MSDN */ + if (wim_resource_size(lte) > REPARSE_POINT_MAX_SIZE - 8) { 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; } @@ -371,7 +375,7 @@ apply_reparse_data(ntfs_inode *ni, struct wim_dentry *dentry, p = put_u16(p, wim_resource_size(lte)); /* ReparseDataLength */ p = put_u16(p, 0); /* Reserved */ - ret = read_full_resource_into_buf(lte, p, false); + ret = read_full_resource_into_buf(lte, p); if (ret) return ret; @@ -379,11 +383,12 @@ apply_reparse_data(ntfs_inode *ni, struct wim_dentry *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; + } else { + progress_info->extract.completed_bytes += wim_resource_size(lte); } - progress_info->extract.completed_bytes += wim_resource_size(lte); - return 0; + return ret; } /* @@ -398,11 +403,11 @@ static int do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni, struct apply_args *args) { - int ret = 0; + int ret; mode_t type; ntfs_inode *ni = NULL; struct wim_inode *inode = dentry->d_inode; - dentry->is_extracted = 1; + dentry->needs_extraction = 0; if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) { type = S_IFDIR; @@ -422,10 +427,7 @@ do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni, * extracted yet, so go ahead and extract the * first one. */ FREE(inode->i_extracted_file); - const tchar *full_path = dentry_full_path(dentry); - - if (!full_path || - !(inode->i_extracted_file = STRDUP(full_path))) + if (!(inode->i_extracted_file = STRDUP(dentry->_full_path))) { ret = WIMLIB_ERR_NOMEM; goto out_close_dir_ni; @@ -444,29 +446,27 @@ do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni, 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; } - /* Write the data streams, unless this is a directory or reparse point - * */ - if (!(inode->i_attributes & (FILE_ATTRIBUTE_REPARSE_POINT | - FILE_ATTRIBUTE_DIRECTORY))) { + /* Write the data streams, unless this is reparse point. */ + if (!(inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)) { ret = write_ntfs_data_streams(ni, dentry, &args->progress); - if (ret != 0) + if (ret) goto out_close_dir_ni; } ret = apply_file_attributes_and_security_data(ni, dir_ni, dentry, args->w, args->extract_flags); - if (ret != 0) + if (ret) goto out_close_dir_ni; if (inode->i_attributes & FILE_ATTR_REPARSE_POINT) { ret = apply_reparse_data(ni, dentry, &args->progress); - if (ret != 0) + if (ret) goto out_close_dir_ni; } @@ -478,18 +478,18 @@ do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni, dentry->short_name_nbytes, &short_name_mbs, &short_name_mbs_nbytes); - if (ret != 0) + if (ret) 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) { + if (ret) { 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(). */ @@ -502,7 +502,7 @@ out_close_dir_ni: 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)) { @@ -510,7 +510,7 @@ out_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: @@ -642,12 +642,12 @@ apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg) 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; } @@ -658,7 +658,7 @@ apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg) 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; } @@ -666,7 +666,7 @@ apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg) 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; }