inode updates (IN PROGRESS)
[wimlib] / src / ntfs-apply.c
index 8d14267..5e36469 100644 (file)
@@ -104,7 +104,7 @@ extract_wim_resource_to_ntfs_attr(const struct lookup_table_entry *lte,
 /* Writes the data streams to a NTFS file
  *
  * @ni:             The NTFS inode for the file.
- * @dentry:  The directory entry in the WIM file.
+ * @inode:   The WIM dentry that has an inode containing the streams.
  * @w:      The WIMStruct for the WIM containing the image we are applying.
  *
  * Returns 0 on success, nonzero on failure.
@@ -116,17 +116,18 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry,
        unsigned stream_idx = 0;
        ntfschar *stream_name = AT_UNNAMED;
        u32 stream_name_len = 0;
+       const struct inode *inode = dentry->inode;
 
        DEBUG("Writing %u NTFS data stream%s for `%s'",
-             dentry->num_ads + 1,
-             (dentry->num_ads == 0 ? "" : "s"),
+             inode->num_ads + 1,
+             (inode->num_ads == 0 ? "" : "s"),
              dentry->full_path_utf8);
 
        while (1) {
                struct lookup_table_entry *lte;
                ntfs_attr *na;
 
-               lte = dentry_stream_lte(dentry, stream_idx, w->lookup_table);
+               lte = inode_stream_lte(inode, stream_idx, w->lookup_table);
 
                if (stream_name_len) {
                        /* Create an empty named stream. */
@@ -159,10 +160,10 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry,
                                break;
                        ntfs_attr_close(na);
                }
-               if (stream_idx == dentry->num_ads)
+               if (stream_idx == inode->num_ads)
                        break;
-               stream_name = (ntfschar*)dentry->ads_entries[stream_idx].stream_name;
-               stream_name_len = dentry->ads_entries[stream_idx].stream_name_len / 2;
+               stream_name = (ntfschar*)inode->ads_entries[stream_idx]->stream_name;
+               stream_name_len = inode->ads_entries[stream_idx]->stream_name_len / 2;
                stream_idx++;
        }
        return ret;
@@ -173,12 +174,12 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry,
  *
  * It is named @from_dentry->file_name and is located under the directory
  * specified by @dir_ni, and it is made to point to the previously extracted
- * file located at @to_dentry->extracted_file.
+ * file located at @inode->extracted_file.
  *
  * Return 0 on success, nonzero on failure.
  */
 static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry,
-                                  const struct dentry *to_dentry,
+                                  const struct inode *inode,
                                   ntfs_inode *dir_ni,
                                   ntfs_inode **to_ni_ret)
 {
@@ -191,7 +192,7 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry,
        ntfs_volume *vol;
 
        wimlib_assert(dentry_is_regular_file(from_dentry)
-                       && dentry_is_regular_file(to_dentry));
+                       && inode_is_regular_file(inode));
 
        if (ntfs_inode_close(dir_ni) != 0) {
                ERROR_WITH_ERRNO("Error closing directory");
@@ -201,13 +202,12 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry,
        vol = dir_ni->vol;
 
        DEBUG("Extracting NTFS hard link `%s' => `%s'",
-             from_dentry->full_path_utf8, to_dentry->extracted_file);
+             from_dentry->full_path_utf8, inode->extracted_file);
 
-       to_ni = ntfs_pathname_to_inode(vol, NULL,
-                                      to_dentry->extracted_file);
+       to_ni = ntfs_pathname_to_inode(vol, NULL, inode->extracted_file);
        if (!to_ni) {
                ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
-                                to_dentry->extracted_file);
+                                inode->extracted_file);
                return WIMLIB_ERR_NTFS_3G;
        }
        p = from_dentry->full_path_utf8 + from_dentry->full_path_utf8_len;
@@ -234,7 +234,7 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry,
        if (ret != 0) {
                ERROR_WITH_ERRNO("Could not create hard link `%s' => `%s'",
                                 from_dentry->full_path_utf8,
-                                to_dentry->extracted_file);
+                                inode->extracted_file);
                ret = WIMLIB_ERR_NTFS_3G;
        }
        *to_ni_ret = to_ni;
@@ -250,14 +250,14 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
                                        const WIMStruct *w)
 {
        DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
-             dentry->full_path_utf8, dentry->attributes);
+             dentry->full_path_utf8, dentry->inode->attributes);
        int ret;
 #ifdef HAVE_NTFS_INODE_FUNCTIONS
-       ret = ntfs_set_inode_attributes(ni, dentry->attributes);
+       ret = ntfs_set_inode_attributes(ni, dentry->inode->attributes);
 #else
        struct SECURITY_CONTEXT ctx;
        u32 attributes_le32;
-       attributes_le32 = cpu_to_le32(dentry->attributes);
+       attributes_le32 = cpu_to_le32(dentry->inode->attributes);
        memset(&ctx, 0, sizeof(ctx));
        ctx.vol = ni->vol;
        ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ATTRIB,
@@ -270,15 +270,15 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
                       dentry->full_path_utf8);
                return WIMLIB_ERR_NTFS_3G;
        }
-       if (dentry->security_id != -1) {
+       if (dentry->inode->security_id != -1) {
                const struct wim_security_data *sd;
                const char *descriptor;
                
                sd = wim_const_security_data(w);
-               wimlib_assert(dentry->security_id < sd->num_entries);
-               descriptor = sd->descriptors[dentry->security_id];
+               wimlib_assert(dentry->inode->security_id < sd->num_entries);
+               descriptor = sd->descriptors[dentry->inode->security_id];
                DEBUG("Applying security descriptor %d to `%s'",
-                     dentry->security_id, dentry->full_path_utf8);
+                     dentry->inode->security_id, dentry->full_path_utf8);
 
        #ifdef HAVE_NTFS_INODE_FUNCTIONS
                u32 selection = OWNER_SECURITY_INFORMATION |
@@ -289,7 +289,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
        #else
                ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
                                                 ni, dir_ni, descriptor,
-                                                sd->sizes[dentry->security_id], 0);
+                                                sd->sizes[dentry->inode->security_id], 0);
        #endif
                                
                if (ret != 0) {
@@ -307,9 +307,9 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry,
        struct lookup_table_entry *lte;
        int ret = 0;
 
-       wimlib_assert(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT);
+       wimlib_assert(dentry->inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT);
 
-       lte = dentry_unnamed_lte(dentry, w->lookup_table);
+       lte = inode_unnamed_lte(dentry->inode, w->lookup_table);
 
        DEBUG("Applying reparse data to `%s'", dentry->full_path_utf8);
 
@@ -327,7 +327,7 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry,
 
        u8 reparse_data_buf[8 + wim_resource_size(lte)];
        u8 *p = reparse_data_buf;
-       p = put_u32(p, dentry->reparse_tag); /* ReparseTag */
+       p = put_u32(p, dentry->inode->reparse_tag); /* ReparseTag */
        p = put_u16(p, wim_resource_size(lte)); /* ReparseDataLength */
        p = put_u16(p, 0); /* Reserved */
 
@@ -364,10 +364,10 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry,
        struct dentry *dentry_with_dos_name;
 
        dentry_with_dos_name = NULL;
-       list_for_each_entry(other, &dentry->link_group_list,
-                           link_group_list)
-       {
-               if (dentry->parent == other->parent && other->short_name_len) {
+       inode_for_each_dentry(other, dentry->inode) {
+               if (other != dentry && (dentry->parent == other->parent)
+                   && other->short_name_len)
+               {
                        if (dentry_with_dos_name) {
                                ERROR("Found multiple DOS names for file `%s' "
                                      "in the same directory",
@@ -379,7 +379,7 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry,
        }
        /* If there's a dentry with a DOS name, extract it first */
        if (dentry_with_dos_name
-           && !dentry_with_dos_name->extracted_file)
+           && !dentry_with_dos_name->inode->extracted_file)
        {
                char *p;
                const char *dir_name;
@@ -430,8 +430,9 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
        ntfs_inode *ni = NULL;
        bool is_hardlink = false;
        ntfs_volume *vol = dir_ni->vol;
+       struct inode *inode = dentry->inode;
 
-       if (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY) {
+       if (inode->attributes & FILE_ATTRIBUTE_DIRECTORY) {
                type = S_IFDIR;
        } else {
                struct dentry *other;
@@ -446,26 +447,26 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
                }
 
                type = S_IFREG;
-               /* See if we can make a hard link */
-               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,
+
+               if (inode->link_count > 1) {
+                       /* Already extracted another dentry in the hard link
+                        * group.  We can make a hard link instead of extracting
+                        * the file data. */
+                       if (inode->extracted_file) {
+                               ret = wim_apply_hardlink_ntfs(dentry, inode,
                                                              dir_ni, &ni);
                                is_hardlink = true;
-                               if (ret) {
+                               if (ret)
                                        goto out_close_dir_ni;
-                               } else {
-                                       dentry->extracted_file = dentry->full_path_utf8;
+                               else
                                        goto out_set_dos_name;
-                               }
                        }
+                       /* Can't make a hard link; extract the file itself */
+                       FREE(inode->extracted_file);
+                       inode->extracted_file = STRDUP(dentry->full_path_utf8);
+                       if (!inode->extracted_file)
+                               return WIMLIB_ERR_NOMEM;
                }
-               /* Can't make a hard link; extract the file itself */
-               dentry->extracted_file = dentry->full_path_utf8;
        }
 
        /* 
@@ -486,8 +487,8 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
 
        /* Write the data streams, unless this is a directory or reparse point
         * */
-       if (!dentry_is_directory(dentry) &&
-            !(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+       if (!(inode->attributes & (FILE_ATTRIBUTE_REPARSE_POINT |
+                                  FILE_ATTRIBUTE_DIRECTORY))) {
                ret = write_ntfs_data_streams(ni, dentry, w);
                if (ret != 0)
                        goto out_close_dir_ni;
@@ -498,7 +499,7 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
        if (ret != 0)
                goto out_close_dir_ni;
 
-       if (dentry->attributes & FILE_ATTR_REPARSE_POINT) {
+       if (inode->attributes & FILE_ATTR_REPARSE_POINT) {
                ret = apply_reparse_data(ni, dentry, w);
                if (ret != 0)
                        goto out_close_dir_ni;
@@ -625,7 +626,7 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg)
        char orig;
        const char *dir_name;
 
-       if (dentry->extracted_file)
+       if (dentry_is_extracted(dentry))
                return 0;
 
        wimlib_assert(dentry->full_path_utf8);
@@ -677,9 +678,9 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg)
        }
 
        p = buf;
-       p = put_u64(p, dentry->creation_time);
-       p = put_u64(p, dentry->last_write_time);
-       p = put_u64(p, dentry->last_access_time);
+       p = put_u64(p, dentry->inode->creation_time);
+       p = put_u64(p, dentry->inode->last_write_time);
+       p = put_u64(p, dentry->inode->last_access_time);
        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'",
@@ -696,11 +697,9 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg)
        return ret;
 }
 
-static int dentry_clear_extracted_file(struct dentry *dentry, void *ignore)
+static int dentry_set_unextracted(struct dentry *dentry, void *ignore)
 {
-       if (dentry->extracted_file != dentry->full_path_utf8)
-               FREE(dentry->extracted_file);
-       dentry->extracted_file = NULL;
+       dentry->is_extracted = false;
        return 0;
 }
 
@@ -722,8 +721,7 @@ static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract
        args.w = w;
        root = wim_root_dentry(w);
 
-       for_dentry_in_tree(root, dentry_clear_extracted_file, NULL);
-
+       for_dentry_in_tree(root, dentry_set_unextracted, NULL);
        ret = for_dentry_in_tree(root, wim_apply_dentry_ntfs, &args);
        if (ret != 0)
                goto out;