X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fextract.c;h=07c6d3def7db7c7363c75fd1b0680b0b4845d680;hb=e0beab67ce67493da928a9fe5957c1f258073b9a;hp=1dd2f618479f0a879e3b4a4e560be1fd05c424a8;hpb=63a5804943519281f206ca0fefacfe2b99fc9958;p=wimlib diff --git a/src/extract.c b/src/extract.c index 1dd2f618..07c6d3de 100644 --- a/src/extract.c +++ b/src/extract.c @@ -124,7 +124,7 @@ static int extract_regular_file_unlinked(WIMStruct *w, int out_fd; int ret; - struct inode *inode = dentry->inode; + struct inode *inode = dentry->d_inode; if (!((extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) && (extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | @@ -198,7 +198,7 @@ static int extract_regular_file(WIMStruct *w, int extract_flags) { struct lookup_table_entry *lte; - const struct inode *inode = dentry->inode; + const struct inode *inode = dentry->d_inode; lte = inode_unnamed_lte(inode, w->lookup_table); @@ -224,7 +224,7 @@ static int extract_symlink(const struct dentry *dentry, const char *output_path, const WIMStruct *w) { char target[4096]; - ssize_t ret = inode_readlink(dentry->inode, 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); @@ -324,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->inode->last_access_time, &tv[0]); - wim_timestamp_to_timeval(dentry->inode->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)); @@ -340,7 +340,7 @@ static int extract_single_image(WIMStruct *w, int image, DEBUG("Extracting image %d", image); int ret; - ret = wimlib_select_image(w, image); + ret = select_wim_image(w, image); if (ret != 0) return ret;