inode fields rename

[wimlib] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index e42aba4d1f6d0bb8975f62088e5554fb7f34588d..2f7a5d838f9dbcea3099e281b213667b84811b12 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -124,37 +124,37 @@ static int extract_regular_file_unlinked(WIMStruct *w,
 
        int out_fd;
        int ret;
-       const struct list_head *head = &dentry->link_group_list;
+       struct inode *inode = dentry->d_inode;
 
-       if (head->next != head &&
-            !(extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE))
+       if (!((extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE)
+               && (extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK |
+                                    WIMLIB_EXTRACT_FLAG_HARDLINK))))
        {
-               /* This dentry is one of a hard link set of at least 2 dentries.
-                * If one of the other dentries has already been extracted, make
-                * a hard link to the file corresponding to this
-                * already-extracted directory.  Otherwise, extract the
-                * file, and set the dentry->extracted_file field so that other
+               /* If the dentry is one of a hard link set of at least 2
+                * dentries and one of the other dentries has already been
+                * extracted, make a hard link to the file corresponding to this
+                * already-extracted directory.  Otherwise, extract the file,
+                * and set the inode->extracted_file field so that other
                 * dentries in the hard link group can link to it. */
-               struct dentry *other;
-               list_for_each_entry(other, head, link_group_list) {
-                       if (other->extracted_file) {
+               if (inode->link_count > 1) {
+                       if (inode->extracted_file) {
                                DEBUG("Extracting hard link `%s' => `%s'",
-                                     output_path, other->extracted_file);
-                               if (link(other->extracted_file, output_path) != 0) {
+                                     output_path, inode->extracted_file);
+                               if (link(inode->extracted_file, output_path) != 0) {
                                        ERROR_WITH_ERRNO("Failed to hard link "
                                                         "`%s' to `%s'",
                                                         output_path,
-                                                        other->extracted_file);
+                                                        inode->extracted_file);
                                        return WIMLIB_ERR_LINK;
                                }
                                return 0;
                        }
-               }
-               FREE(dentry->extracted_file);
-               dentry->extracted_file = STRDUP(output_path);
-               if (!dentry->extracted_file) {
-                       ERROR("Failed to allocate memory for filename");
-                       return WIMLIB_ERR_NOMEM;
+                       FREE(inode->extracted_file);
+                       inode->extracted_file = STRDUP(output_path);
+                       if (!inode->extracted_file) {
+                               ERROR("Failed to allocate memory for filename");
+                               return WIMLIB_ERR_NOMEM;
+                       }
                }
        }
 
@@ -171,16 +171,16 @@ static int extract_regular_file_unlinked(WIMStruct *w,
                /* Empty file with no lookup table entry */
                DEBUG("Empty file `%s'.", output_path);
                ret = 0;
-               goto done;
+               goto out;
        }
 
        ret = extract_full_wim_resource_to_fd(lte, out_fd);
        if (ret != 0) {
                ERROR("Failed to extract resource to `%s'", output_path);
-               goto done;
+               goto out;
        }
 
-done:
+out:
        if (close(out_fd) != 0) {
                ERROR_WITH_ERRNO("Failed to close file `%s'", output_path);
                ret = WIMLIB_ERR_WRITE;
@@ -198,18 +198,21 @@ static int extract_regular_file(WIMStruct *w,
                                int extract_flags)
 {
        struct lookup_table_entry *lte;
+       const struct inode *inode = dentry->d_inode;
 
-       lte = dentry_unnamed_lte(dentry, w->lookup_table);
+       lte = inode_unnamed_lte(inode, w->lookup_table);
 
        if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK |
                              WIMLIB_EXTRACT_FLAG_HARDLINK)) && lte) {
-               if (++lte->out_refcnt != 1)
+               if (lte->extracted_file) {
                        return extract_regular_file_linked(dentry, output_dir,
                                                           output_path,
                                                           extract_flags, lte);
-               lte->extracted_file = STRDUP(output_path);
-               if (!lte->extracted_file)
-                       return WIMLIB_ERR_NOMEM;
+               } else {
+                       lte->extracted_file = STRDUP(output_path);
+                       if (!lte->extracted_file)
+                               return WIMLIB_ERR_NOMEM;
+               }
        }
 
        return extract_regular_file_unlinked(w, dentry, output_path,
@@ -221,7 +224,7 @@ static int extract_symlink(const struct dentry *dentry, const char *output_path,
                           const WIMStruct *w)
 {
        char target[4096];
-       ssize_t ret = dentry_readlink(dentry, target, sizeof(target), w);
+       ssize_t ret = inode_readlink(dentry->d_inode, target, sizeof(target), w);
        if (ret <= 0) {
                ERROR("Could not read the symbolic link from dentry `%s'",
                      dentry->full_path_utf8);
@@ -321,8 +324,8 @@ static int apply_dentry_timestamps(struct dentry *dentry, void *arg)
        output_path[len + dentry->full_path_utf8_len] = '\0';
 
        struct timeval tv[2];
-       wim_timestamp_to_timeval(dentry->last_access_time, &tv[0]);
-       wim_timestamp_to_timeval(dentry->last_write_time, &tv[1]);
+       wim_timestamp_to_timeval(dentry->d_inode->last_access_time, &tv[0]);
+       wim_timestamp_to_timeval(dentry->d_inode->last_write_time, &tv[1]);
        if (lutimes(output_path, tv) != 0) {
                WARNING("Failed to set timestamp on file `%s': %s",
                        output_path, strerror(errno));
@@ -427,8 +430,7 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image,
                w->lookup_table = joined_tab;
        }
 
-
-       for_lookup_table_entry(w->lookup_table, zero_out_refcnts, NULL);
+       for_lookup_table_entry(w->lookup_table, lte_free_extracted_file, NULL);
 
        if (image == WIM_ALL_IMAGES) {
                flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE;