WIMStruct *w;
};
-extern int _ntfs_set_file_security(ntfs_inode *ni, u32 selection,
+extern int ntfs_inode_set_security(ntfs_inode *ni, u32 selection,
const char *attr);
-extern int _ntfs_set_file_attributes(ntfs_inode *ni, s32 attrib);
+extern int ntfs_inode_set_attributes(ntfs_inode *ni, s32 attrib);
/*
* Extracts a WIM resource to a NTFS attribute.
sha1_final(hash, &ctx);
if (!hashes_equal(hash, lte->hash)) {
ERROR("Invalid checksum on a WIM resource "
- "(detected when extracting to NTFS stream file)");
+ "(detected when extracting to NTFS stream)");
ERROR("The following WIM resource is invalid:");
print_lookup_table_entry(lte);
return WIMLIB_ERR_INVALID_RESOURCE_HASH;
return ret;
}
+static bool in_same_dir(const char *path1, const char *path2)
+{
+ const char *p1 = strrchr(path1, '/');
+ const char *p2 = strrchr(path2, '/');
+ if (p1 - path1 != p2 - path2)
+ return false;
+ return memcmp(path1, path2, p1 - path1) == 0;
+}
+
/*
* Makes a NTFS hard link
*
ntfs_inode **to_ni_ret)
{
int ret;
+ char *p;
+ char orig;
+ const char *dir_name;
+
ntfs_inode *to_ni;
+ ntfs_volume *vol;
wimlib_assert(dentry_is_regular_file(from_dentry)
&& dentry_is_regular_file(to_dentry));
+ if (ntfs_inode_close(dir_ni) != 0) {
+ ERROR_WITH_ERRNO("Error closing directory");
+ return WIMLIB_ERR_NTFS_3G;
+ }
+
+ vol = dir_ni->vol;
+
DEBUG("Extracting NTFS hard link `%s' => `%s'",
from_dentry->full_path_utf8, to_dentry->extracted_file);
- to_ni = ntfs_pathname_to_inode(dir_ni->vol, NULL,
+ to_ni = ntfs_pathname_to_inode(vol, NULL,
to_dentry->extracted_file);
if (!to_ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
to_dentry->extracted_file);
return WIMLIB_ERR_NTFS_3G;
}
+ p = from_dentry->full_path_utf8 + from_dentry->full_path_utf8_len;
+ do {
+ p--;
+ } while (*p != '/');
+
+ orig = *p;
+ *p = '\0';
+ dir_name = from_dentry->full_path_utf8;
+
+ dir_ni = ntfs_pathname_to_inode(vol, NULL,
+ from_dentry->full_path_utf8);
+ if (!dir_ni) {
+ ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
+ from_dentry->full_path_utf8);
+ *p = orig;
+ return WIMLIB_ERR_NTFS_3G;
+ }
+ *p = orig;
+
ret = ntfs_link(to_ni, dir_ni,
(ntfschar*)from_dentry->file_name,
from_dentry->file_name_len / 2);
{
DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
dentry->full_path_utf8, dentry->attributes);
- if (!_ntfs_set_file_attributes(ni, dentry->attributes)) {
+ if (!ntfs_inode_set_attributes(ni, dentry->attributes)) {
ERROR("Failed to set NTFS file attributes on `%s'",
dentry->full_path_utf8);
return WIMLIB_ERR_NTFS_3G;
DACL_SECURITY_INFORMATION |
SACL_SECURITY_INFORMATION;
- if (!_ntfs_set_file_security(ni, selection,
+ if (!ntfs_inode_set_security(ni, selection,
sd->descriptors[dentry->security_id]))
{
ERROR_WITH_ERRNO("Failed to set security data on `%s'",
lte = dentry_first_lte(dentry, w->lookup_table);
+ DEBUG("Applying reparse data to `%s'", dentry->full_path_utf8);
+
if (!lte) {
ERROR("Could not find reparse data for `%s'",
dentry->full_path_utf8);
} else {
struct dentry *other;
+ /* Apply hard-linked directory in same directory with DOS name
+ * (if there is one) before this dentry */
ret = preapply_dentry_with_dos_name(dentry, &dir_ni, w);
if (ret != 0)
return ret;
list_for_each_entry(other, &dentry->link_group_list,
link_group_list) {
if (other->extracted_file) {
+ /* Already extracted another dentry in the hard
+ * link group. We can make a hard link instead
+ * of extracting the file data. */
ret = wim_apply_hardlink_ntfs(dentry, other,
dir_ni, &ni);
is_hardlink = true;
goto out_set_dos_name;
}
}
- /* Can't make a hard link */
+ /* Can't make a hard link; extract the file itself */
FREE(dentry->extracted_file);
dentry->extracted_file = STRDUP(dentry->full_path_utf8);
if (!dentry->extracted_file) {
ntfs_volume *vol;
int ret;
+ DEBUG("Mounting NTFS volume `%s'", device);
vol = ntfs_mount(device, 0);
if (!vol) {
ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s'", device);
wim_apply_dentry_timestamps,
&args);
out:
+ DEBUG("Unmounting NTFS volume `%s'", device);
if (ntfs_umount(vol, FALSE) != 0) {
ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device);
if (ret == 0)
if (ret != 0)
return ret;
-#if 0
- if (getuid() != 0) {
- ERROR("We are not root, but NTFS-3g requires root privileges to set arbitrary");
- ERROR("security data on the NTFS filesystem. Please run this program as root");
- ERROR("if you want to extract a WIM image while preserving NTFS-specific");
- ERROR("information.");
-
- return WIMLIB_ERR_NOT_ROOT;
- }
-#endif
return do_wim_apply_image_ntfs(w, device, flags);
}