X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=c3b92b07c016509efbdbc386413de50615a54c90;hp=1648adea343f911c5f789df65429c929598f21b1;hb=5aff98df1f754cd809b88051caad99c58b50dfab;hpb=b8dd0c7d735c9e7db3f190a284a6255dab10ef1b diff --git a/src/extract.c b/src/extract.c index 1648adea..c3b92b07 100644 --- a/src/extract.c +++ b/src/extract.c @@ -24,21 +24,21 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "wimlib_internal.h" -#include "dentry.h" -#include "lookup_table.h" -#include "xml.h" -#include -#include -#include + #include -#include #include +#include +#include +#include +#include +#include -#ifdef WITH_NTFS_3G -#include -#include -#endif +#include "config.h" +#include "dentry.h" +#include "lookup_table.h" +#include "timestamp.h" +#include "wimlib_internal.h" +#include "xml.h" /* Internal */ #define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 @@ -209,7 +209,7 @@ static int extract_regular_file(WIMStruct *w, { struct lookup_table_entry *lte; - lte = __lookup_resource(w->lookup_table, dentry_hash(dentry)); + lte = dentry_first_lte(dentry, w->lookup_table); if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) && lte) { @@ -253,22 +253,32 @@ static int extract_symlink(const struct dentry *dentry, const char *output_path, * @output_path: The path to which the directory is to be extracted to. * @return: True on success, false on failure. */ -static int extract_directory(const char *output_path) +static int extract_directory(const char *output_path, bool is_root) { - /* Compute the output path directory to the directory. */ - if (mkdir(output_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0) - { - switch (errno) { - case EEXIST: /* Already existing directory is OK */ - case EACCES: /* We may have permissions to extract files inside - the directory, but not for the directory - itself. */ + int ret; + struct stat stbuf; + ret = stat(output_path, &stbuf); + if (ret == 0) { + if (S_ISDIR(stbuf.st_mode)) { + if (!is_root) + WARNING("`%s' already exists", output_path); return 0; - default: - ERROR_WITH_ERRNO("Cannot create directory `%s'", - output_path); + } else { + ERROR("`%s' is not a directory", output_path); return WIMLIB_ERR_MKDIR; } + } else { + if (errno != ENOENT) { + ERROR_WITH_ERRNO("Failed to stat `%s'", output_path); + return WIMLIB_ERR_STAT; + } + } + /* Compute the output path directory to the directory. */ + if (mkdir(output_path, S_IRWXU | S_IRGRP | S_IXGRP | + S_IROTH | S_IXOTH) != 0) { + ERROR_WITH_ERRNO("Cannot create directory `%s'", + output_path); + return WIMLIB_ERR_MKDIR; } return 0; } @@ -283,11 +293,8 @@ struct extract_args { }; /* - * Extracts a file or directory from the WIM archive. For use in - * for_dentry_in_tree(). - * - * @dentry: The dentry to extract. - * @arg: A pointer to the WIMStruct for the WIM file. + * Extracts a file, directory, or symbolic link from the WIM archive. For use + * in for_dentry_in_tree(). */ static int extract_dentry(struct dentry *dentry, void *arg) { @@ -296,24 +303,48 @@ static int extract_dentry(struct dentry *dentry, void *arg) int extract_flags = args->extract_flags; size_t len = strlen(args->output_dir); char output_path[len + dentry->full_path_utf8_len + 1]; - int ret = 0; + int ret; - if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) + if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) { + wimlib_assert(dentry->full_path_utf8); puts(dentry->full_path_utf8); + } memcpy(output_path, args->output_dir, len); memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len); output_path[len + dentry->full_path_utf8_len] = '\0'; - if (dentry_is_symlink(dentry)) { + if (dentry_is_symlink(dentry)) ret = extract_symlink(dentry, output_path, w); - } else if (dentry_is_directory(dentry)) { - ret = extract_directory(output_path); - } else { + else if (dentry_is_directory(dentry)) + ret = extract_directory(output_path, dentry_is_root(dentry)); + else ret = extract_regular_file(w, dentry, args->output_dir, - output_path, extract_flags); + output_path, extract_flags); + if (ret != 0) + return ret; + + return 0; +} + +static int apply_dentry_timestamps(struct dentry *dentry, void *arg) +{ + struct extract_args *args = arg; + size_t len = strlen(args->output_dir); + char output_path[len + dentry->full_path_utf8_len + 1]; + + memcpy(output_path, args->output_dir, len); + memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len); + 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]); + if (lutimes(output_path, tv) != 0) { + WARNING("Failed to set timestamp on file `%s': %s", + output_path, strerror(errno)); } - return ret; + return 0; } @@ -336,7 +367,12 @@ static int extract_single_image(WIMStruct *w, int image, #endif }; - return for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args); + ret = for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args); + if (ret != 0) + return ret; + return for_dentry_in_tree_depth(wim_root_dentry(w), + apply_dentry_timestamps, &args); + } @@ -354,7 +390,7 @@ static int extract_all_images(WIMStruct *w, const char *output_dir, DEBUG("Attempting to extract all images from `%s'", w->filename); - ret = extract_directory(output_dir); + ret = extract_directory(output_dir, true); if (ret != 0) return ret; @@ -383,50 +419,21 @@ done: WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image, const char *output_dir, int flags) { - int ret; if (!output_dir) return WIMLIB_ERR_INVALID_PARAM; + if ((flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) == (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) return WIMLIB_ERR_INVALID_PARAM; + for_lookup_table_entry(w->lookup_table, zero_out_refcnts, NULL); + if (image == WIM_ALL_IMAGES) { flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; - for_lookup_table_entry(w->lookup_table, zero_out_refcnts, NULL); + return extract_all_images(w, output_dir, flags); } else { flags &= ~WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; + return extract_single_image(w, image, output_dir, flags); } - - if ((flags & WIMLIB_EXTRACT_FLAG_NTFS)) { - #ifdef WITH_NTFS_3G - unsigned long mnt_flags; - ret = ntfs_check_if_mounted(output_dir, &mnt_flags); - if (ret != 0) { - ERROR_WITH_ERRNO("NTFS-3g: Cannot determine if `%s' " - "is mounted", output_dir); - return WIMLIB_ERR_NTFS_3G; - } - if (!(mnt_flags & NTFS_MF_MOUNTED)) { - ERROR("NTFS-3g: Filesystem on `%s' is not mounted ", - output_dir); - return WIMLIB_ERR_NTFS_3G; - } - if (mnt_flags & NTFS_MF_READONLY) { - ERROR("NTFS-3g: Filesystem on `%s' is mounted " - "read-only", output_dir); - return WIMLIB_ERR_NTFS_3G; - } - #else - ERROR("wimlib was compiled without support for NTFS-3g, so"); - ERROR("we cannot extract a WIM image while preserving NTFS-"); - ERROR("specific information"); - return WIMLIB_ERR_UNSUPPORTED; - #endif - } - if (image == WIM_ALL_IMAGES) - ret = extract_all_images(w, output_dir, flags); - else - ret = extract_single_image(w, image, output_dir, flags); - return ret; }