refcnt image metadata; calculate full path on-demand

[wimlib] / src / ntfs-apply.c

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 994bbd275979deeb2bfef1c15c9e110586c668c6..19c784586ce4c41cca855bddfa87cbf70848e479 100644 (file)
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -92,7 +92,7 @@ extract_wim_resource_to_ntfs_attr(const struct wim_lookup_table_entry *lte,
  * Returns 0 on success, nonzero on failure.
  */
 static int
  * 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;
                        union wimlib_progress_info *progress_info)
 {
        int ret = 0;


@@ -105,7 +105,7 @@ write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
        DEBUG("Writing %u NTFS data stream%s for `%s'",
              inode->i_num_ads + 1,
              (inode->i_num_ads == 0 ? "" : "s"),
        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) {
 
        lte = inode->i_lte;
        while (1) {


@@ -125,7 +125,7 @@ write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
                                ERROR_WITH_ERRNO("Failed to create named data "
                                                 "stream for extracted file "
                                                 "`%s'",
                                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;
 
                                ret = WIMLIB_ERR_NTFS_3G;
                                break;
 


@@ -142,7 +142,7 @@ write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
                        if (!na) {
                                ERROR_WITH_ERRNO("Failed to open a data stream of "
                                                 "extracted file `%s'",
                        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;
                        }
                                ret = WIMLIB_ERR_NTFS_3G;
                                break;
                        }


@@ -184,21 +184,24 @@ write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
 /* Open the NTFS inode that corresponds to the parent of a WIM dentry.  Returns
  * the opened inode, or NULL on failure. */
 static ntfs_inode *
 /* 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;
 
 {
        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';
        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'",
        dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name);
        if (!dir_ni) {
                ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",


@@ -224,7 +227,7 @@ dentry_open_parent_ni(const struct wim_dentry *dentry, ntfs_volume *vol)
  * Return 0 on success, nonzero on failure.  dir_ni is closed either way.
  */
 static int
  * 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)
 {
                    const struct wim_inode *inode,
                    ntfs_inode *dir_ni)
 {


@@ -240,7 +243,7 @@ apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
        }
 
        DEBUG("Extracting NTFS hard link `%s' => `%s'",
        }
 
        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) {
 
        to_ni = ntfs_pathname_to_inode(vol, NULL, inode->i_extracted_file);
        if (!to_ni) {


@@ -262,7 +265,7 @@ apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
        ret |= ntfs_inode_close(to_ni);
        if (ret) {
                ERROR_WITH_ERRNO("Could not create hard link `%s' => `%s'",
        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;
        }
                                 inode->i_extracted_file);
                ret = WIMLIB_ERR_NTFS_3G;
        }


@@ -283,7 +286,7 @@ apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
 static int
 apply_file_attributes_and_security_data(ntfs_inode *ni,
                                        ntfs_inode *dir_ni,
 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)
 {
                                        const WIMStruct *w,
                                        int extract_flags)
 {


@@ -295,7 +298,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
        inode = dentry->d_inode;
 
        DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
        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));
 
        attributes_le32 = cpu_to_le32(inode->i_attributes);
        memset(&ctx, 0, sizeof(ctx));


@@ -306,7 +309,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
                                         sizeof(u32), 0);
        if (ret != 0) {
                ERROR("Failed to set NTFS file attributes on `%s'",
                                         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 &&
                return WIMLIB_ERR_NTFS_3G;
        }
        if (inode->i_security_id != -1 &&


@@ -319,7 +322,7 @@ 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'",
                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,
 
                ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
                                                 ni, dir_ni, desc,


@@ -327,7 +330,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
 
                if (ret != 0) {
                        ERROR_WITH_ERRNO("Failed to set security data on `%s'",
 
                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;
                }
        }
                        return WIMLIB_ERR_NTFS_3G;
                }
        }


@@ -339,7 +342,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
  * point) to a NTFS inode.
  */
 static int
  * 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;
                   union wimlib_progress_info *progress_info)
 {
        struct wim_lookup_table_entry *lte;


@@ -347,17 +350,17 @@ apply_reparse_data(ntfs_inode *ni, const struct wim_dentry *dentry,
 
        lte = inode_unnamed_lte_resolved(dentry->d_inode);
 
 
        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'",
 
        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)",
                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;
        }
 
                return WIMLIB_ERR_INVALID_DENTRY;
        }
 


@@ -376,7 +379,7 @@ apply_reparse_data(ntfs_inode *ni, const struct wim_dentry *dentry,
                                         wim_resource_size(lte) + 8, 0);
        if (ret) {
                ERROR_WITH_ERRNO("Failed to set NTFS reparse data on `%s'",
                                         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);
                return WIMLIB_ERR_NTFS_3G;
        }
        progress_info->extract.completed_bytes += wim_resource_size(lte);


@@ -419,8 +422,11 @@ 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);
                                 * 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;
                                }
                                        ret = WIMLIB_ERR_NOMEM;
                                        goto out_close_dir_ni;
                                }


@@ -438,7 +444,7 @@ do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni,
 
        if (!ni) {
                ERROR_WITH_ERRNO("Could not create NTFS inode for `%s'",
 
        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;
        }
                ret = WIMLIB_ERR_NTFS_3G;
                goto out_close_dir_ni;
        }


@@ -476,14 +482,14 @@ do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni,
                        goto out_close_dir_ni;
 
                DEBUG("Setting short (DOS) name of `%s' to %s",
                        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'",
 
                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(). */
                        ret = WIMLIB_ERR_NTFS_3G;
                }
                /* inodes have been closed by ntfs_set_ntfs_dos_name(). */


@@ -496,14 +502,15 @@ out_close_dir_ni:
                                if (ret == 0)
                                        ret = WIMLIB_ERR_NTFS_3G;
                                ERROR_WITH_ERRNO("Failed to close inode for `%s'",
                                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 "
                        }
                }
                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:
                }
        }
 out:


@@ -511,7 +518,7 @@ out:
 }
 
 static int
 }
 
 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_volume *vol, const WIMStruct *w,
                       int extract_flags)
 {


@@ -635,12 +642,12 @@ apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg)
        ntfs_inode *ni;
        int ret;
 
        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'",
        if (!ni) {
                ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",

-                                dentry->full_path);
+                                dentry_full_path(dentry));

                return WIMLIB_ERR_NTFS_3G;
        }
 
                return WIMLIB_ERR_NTFS_3G;
        }
 


@@ -651,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'",
        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;
        }
 
                ret = WIMLIB_ERR_NTFS_3G;
        }
 


@@ -659,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'",
                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;
 }
        }
        return ret;
 }