X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract_image.c;h=0f9252a3c36badd60103dc007821e30a7c0a3ca7;hp=6279c4901c75402be3f7f96856fd32cd4be75ca1;hb=28fd72017ded230c4a0e4efdf24f2e2e55ba9f36;hpb=8f520d21297a3ae557d82b586ad369662714d829 diff --git a/src/extract_image.c b/src/extract_image.c index 6279c490..0f9252a3 100644 --- a/src/extract_image.c +++ b/src/extract_image.c @@ -42,7 +42,6 @@ #include #include #include - #include #include "dentry.h" @@ -59,10 +58,38 @@ #endif #ifndef __WIN32__ -static int extract_regular_file_linked(struct wim_dentry *dentry, - const char *output_path, - struct apply_args *args, - struct wim_lookup_table_entry *lte) + +/* Returns the number of components of @path. */ +static unsigned +get_num_path_components(const char *path) +{ + unsigned num_components = 0; + while (*path) { + while (*path == '/') + path++; + if (*path) + num_components++; + while (*path && *path != '/') + path++; + } + return num_components; +} + +static const char * +path_next_part(const char *path) +{ + while (*path && *path != '/') + path++; + while (*path && *path == '/') + path++; + return path; +} + +static int +extract_regular_file_linked(struct wim_dentry *dentry, + const char *output_path, + struct apply_args *args, + struct wim_lookup_table_entry *lte) { /* This mode overrides the normal hard-link extraction and * instead either symlinks or hardlinks *all* identical files in @@ -85,7 +112,7 @@ static int extract_regular_file_linked(struct wim_dentry *dentry, size_t i; num_path_components = - get_num_path_components(dentry->full_path_utf8) - 1; + get_num_path_components(dentry->full_path) - 1; num_output_dir_path_components = get_num_path_components(args->target); @@ -106,12 +133,13 @@ static int extract_regular_file_linked(struct wim_dentry *dentry, p2 = lte->extracted_file; while (*p2 == '/') p2++; - while (num_output_dir_path_components--) - p2 = path_next_part(p2, NULL); + while (num_output_dir_path_components > 0) { + p2 = path_next_part(p2); + num_output_dir_path_components--; + } strcpy(p, p2); if (symlink(buf, output_path) != 0) { - ERROR_WITH_ERRNO("Failed to symlink `%s' to " - "`%s'", + ERROR_WITH_ERRNO("Failed to symlink `%s' to `%s'", buf, lte->extracted_file); return WIMLIB_ERR_LINK; } @@ -119,8 +147,9 @@ static int extract_regular_file_linked(struct wim_dentry *dentry, return 0; } -static int symlink_apply_unix_data(const char *link, - const struct wimlib_unix_data *unix_data) +static int +symlink_apply_unix_data(const char *link, + const struct wimlib_unix_data *unix_data) { if (lchown(link, unix_data->uid, unix_data->gid)) { if (errno == EPERM) { @@ -134,7 +163,8 @@ static int symlink_apply_unix_data(const char *link, return 0; } -static int fd_apply_unix_data(int fd, const struct wimlib_unix_data *unix_data) +static int +fd_apply_unix_data(int fd, const struct wimlib_unix_data *unix_data) { if (fchown(fd, unix_data->uid, unix_data->gid)) { if (errno == EPERM) { @@ -158,8 +188,8 @@ static int fd_apply_unix_data(int fd, const struct wimlib_unix_data *unix_data) return 0; } -static int dir_apply_unix_data(const char *dir, - const struct wimlib_unix_data *unix_data) +static int +dir_apply_unix_data(const char *dir, const struct wimlib_unix_data *unix_data) { int dfd = open(dir, O_RDONLY); int ret; @@ -176,10 +206,11 @@ static int dir_apply_unix_data(const char *dir, return ret; } -static int extract_regular_file_unlinked(struct wim_dentry *dentry, - struct apply_args *args, - const char *output_path, - struct wim_lookup_table_entry *lte) +static int +extract_regular_file_unlinked(struct wim_dentry *dentry, + struct apply_args *args, + const char *output_path, + struct wim_lookup_table_entry *lte) { /* Normal mode of extraction. Regular files and hard links are * extracted in the way that they appear in the WIM. */ @@ -266,9 +297,10 @@ out: return ret; } -static int extract_regular_file(struct wim_dentry *dentry, - struct apply_args *args, - const char *output_path) +static int +extract_regular_file(struct wim_dentry *dentry, + struct apply_args *args, + const char *output_path) { struct wim_lookup_table_entry *lte; const struct wim_inode *inode = dentry->d_inode; @@ -289,9 +321,10 @@ static int extract_regular_file(struct wim_dentry *dentry, return extract_regular_file_unlinked(dentry, args, output_path, lte); } -static int extract_symlink(struct wim_dentry *dentry, - struct apply_args *args, - const char *output_path) +static int +extract_symlink(struct wim_dentry *dentry, + struct apply_args *args, + const char *output_path) { char target[4096]; ssize_t ret = inode_readlink(dentry->d_inode, target, @@ -300,7 +333,7 @@ static int extract_symlink(struct wim_dentry *dentry, if (ret <= 0) { ERROR("Could not read the symbolic link from dentry `%s'", - dentry->full_path_utf8); + dentry->full_path); return WIMLIB_ERR_INVALID_DENTRY; } ret = symlink(target, output_path); @@ -329,32 +362,33 @@ static int extract_symlink(struct wim_dentry *dentry, #endif /* !__WIN32__ */ -static int extract_directory(struct wim_dentry *dentry, - const char *output_path, bool is_root) +static int +extract_directory(struct wim_dentry *dentry, + const tchar *output_path, bool is_root) { int ret; struct stat stbuf; - ret = stat(output_path, &stbuf); + ret = tstat(output_path, &stbuf); if (ret == 0) { if (S_ISDIR(stbuf.st_mode)) { /*if (!is_root)*/ /*WARNING("`%s' already exists", output_path);*/ goto dir_exists; } else { - ERROR("`%s' is not a directory", output_path); + ERROR("`%"TS"' is not a directory", output_path); return WIMLIB_ERR_MKDIR; } } else { if (errno != ENOENT) { - ERROR_WITH_ERRNO("Failed to stat `%s'", output_path); + ERROR_WITH_ERRNO("Failed to stat `%"TS"'", output_path); return WIMLIB_ERR_STAT; } } - if (mkdir(output_path, S_IRWXU | S_IRGRP | S_IXGRP | - S_IROTH | S_IXOTH) != 0) { - ERROR_WITH_ERRNO("Cannot create directory `%s'", - output_path); + + if (tmkdir(output_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)) + { + ERROR_WITH_ERRNO("Cannot create directory `%"TS"'", output_path); return WIMLIB_ERR_MKDIR; } dir_exists: @@ -392,62 +426,85 @@ static int unix_do_apply_dentry(const char *output_path, return extract_regular_file(dentry, args, output_path); } -static int unix_do_apply_dentry_timestamps(const char *output_path, - size_t output_path_len, - const struct wim_dentry *dentry, - struct apply_args *args) +static int +unix_do_apply_dentry_timestamps(const char *output_path, + size_t output_path_len, + const struct wim_dentry *dentry, + struct apply_args *args) { int ret; const struct wim_inode *inode = dentry->d_inode; +#ifdef HAVE_UTIMENSAT /* Convert the WIM timestamps, which are accurate to 100 nanoseconds, - * into struct timeval's. */ - struct timeval tv[2]; - wim_timestamp_to_timeval(inode->i_last_access_time, &tv[0]); - wim_timestamp_to_timeval(inode->i_last_write_time, &tv[1]); + * into `struct timespec's for passing to utimensat(), which is accurate + * to 1 nanosecond. */ + + struct timespec ts[2]; + ts[0] = wim_timestamp_to_timespec(inode->i_last_access_time); + ts[1] = wim_timestamp_to_timespec(inode->i_last_write_time); + ret = utimensat(AT_FDCWD, output_path, ts, AT_SYMLINK_NOFOLLOW); + if (ret) + ret = errno; +#else + ret = ENOSYS; +#endif + + if (ret == ENOSYS) { + /* utimensat() not implemented or not available */ #ifdef HAVE_LUTIMES - ret = lutimes(output_path, tv); - #else - ret = -1; - errno = ENOSYS; + /* Convert the WIM timestamps, which are accurate to 100 + * nanoseconds, into `struct timeval's for passing to lutimes(), + * which is accurate to 1 microsecond. */ + struct timeval tv[2]; + tv[0] = wim_timestamp_to_timeval(inode->i_last_access_time); + tv[1] = wim_timestamp_to_timeval(inode->i_last_write_time); + ret = lutimes(output_path, tv); + if (ret) + ret = errno; + #endif + } + + if (ret == ENOSYS) { + /* utimensat() and lutimes() both not implemented or not + * available */ + #ifdef HAVE_UTIME + /* Convert the WIM timestamps, which are accurate to 100 + * nanoseconds, into a `struct utimbuf's for passing to + * utime(), which is accurate to 1 second. */ + struct utimbuf buf; + buf.actime = wim_timestamp_to_unix(inode->i_last_access_time); + buf.modtime = wim_timestamp_to_unix(inode->i_last_write_time); + ret = utime(output_path, &buf); #endif - if (ret != 0) { - #ifdef HAVE_UTIME - if (errno == ENOSYS) { - struct utimbuf buf; - buf.actime = wim_timestamp_to_unix(inode->i_last_access_time); - buf.modtime = wim_timestamp_to_unix(inode->i_last_write_time); - if (utime(output_path, &buf) == 0) - return 0; - } - #endif - if (errno != ENOSYS || args->num_lutimes_warnings < 10) { - /*WARNING_WITH_ERRNO("Failed to set timestamp on file `%s',*/ - /*output_path");*/ - args->num_lutimes_warnings++; - } + } + if (ret && args->num_utime_warnings < 10) { + WARNING_WITH_ERRNO("Failed to set timestamp on file `%s'", + output_path); + args->num_utime_warnings++; } return 0; } #endif /* !__WIN32__ */ /* Extracts a file, directory, or symbolic link from the WIM archive. */ -static int apply_dentry_normal(struct wim_dentry *dentry, void *arg) +static int +apply_dentry_normal(struct wim_dentry *dentry, void *arg) { struct apply_args *args = arg; - struct wim_inode *inode = dentry->d_inode; + tchar *output_path; size_t len; - char *output_path; - len = strlen(args->target); + len = tstrlen(args->target); if (dentry_is_root(dentry)) { - output_path = (char*)args->target; + output_path = (tchar*)args->target; } else { - output_path = alloca(len + dentry->full_path_utf8_len + 1); - memcpy(output_path, args->target, len); - memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len); - output_path[len + dentry->full_path_utf8_len] = '\0'; - len += dentry->full_path_utf8_len; + output_path = alloca(len * sizeof(tchar) + dentry->full_path_nbytes + + sizeof(tchar)); + memcpy(output_path, args->target, len * sizeof(tchar)); + memcpy(output_path + len, dentry->full_path, dentry->full_path_nbytes); + len += dentry->full_path_nbytes / sizeof(tchar); + output_path[len] = T('\0'); } #ifdef __WIN32__ return win32_do_apply_dentry(output_path, len, dentry, args); @@ -458,22 +515,26 @@ static int apply_dentry_normal(struct wim_dentry *dentry, void *arg) /* Apply timestamps to an extracted file or directory */ -static int apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg) +static int +apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg) { struct apply_args *args = arg; size_t len; - char *output_path; + tchar *output_path; - len = strlen(args->target); + len = tstrlen(args->target); if (dentry_is_root(dentry)) { - output_path = (char*)args->target; + output_path = (tchar*)args->target; } else { - output_path = alloca(len + dentry->full_path_utf8_len + 1); - memcpy(output_path, args->target, len); - memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len); - output_path[len + dentry->full_path_utf8_len] = '\0'; - len += dentry->full_path_utf8_len; + output_path = alloca(len * sizeof(tchar) + dentry->full_path_nbytes + + sizeof(tchar)); + memcpy(output_path, args->target, len * sizeof(tchar)); + memcpy(output_path + len, dentry->full_path, dentry->full_path_nbytes); + len += dentry->full_path_nbytes / sizeof(tchar); + output_path[len] = T('\0'); } + + #ifdef __WIN32__ return win32_do_apply_dentry_timestamps(output_path, len, dentry, args); #else @@ -483,7 +544,8 @@ static int apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg) /* Extract a dentry if it hasn't already been extracted, and either the dentry * has no streams or WIMLIB_EXTRACT_FLAG_NO_STREAMS is not specified. */ -static int maybe_apply_dentry(struct wim_dentry *dentry, void *arg) +static int +maybe_apply_dentry(struct wim_dentry *dentry, void *arg) { struct apply_args *args = arg; int ret; @@ -497,7 +559,7 @@ static int maybe_apply_dentry(struct wim_dentry *dentry, void *arg) if ((args->extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) && args->progress_func) { - args->progress.extract.cur_path = dentry->full_path_utf8; + args->progress.extract.cur_path = dentry->full_path; args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY, &args->progress); } @@ -507,7 +569,8 @@ static int maybe_apply_dentry(struct wim_dentry *dentry, void *arg) return ret; } -static int cmp_streams_by_wim_position(const void *p1, const void *p2) +static int +cmp_streams_by_wim_position(const void *p1, const void *p2) { const struct wim_lookup_table_entry *lte1, *lte2; lte1 = *(const struct wim_lookup_table_entry**)p1; @@ -520,7 +583,8 @@ static int cmp_streams_by_wim_position(const void *p1, const void *p2) return 0; } -static int sort_stream_list_by_wim_position(struct list_head *stream_list) +static int +sort_stream_list_by_wim_position(struct list_head *stream_list) { struct list_head *cur; size_t num_streams; @@ -553,9 +617,10 @@ static int sort_stream_list_by_wim_position(struct list_head *stream_list) return 0; } -static void calculate_bytes_to_extract(struct list_head *stream_list, - int extract_flags, - union wimlib_progress_info *progress) +static void +calculate_bytes_to_extract(struct list_head *stream_list, + int extract_flags, + union wimlib_progress_info *progress) { struct wim_lookup_table_entry *lte; u64 total_bytes = 0; @@ -584,8 +649,9 @@ static void calculate_bytes_to_extract(struct list_head *stream_list, progress->extract.completed_bytes = 0; } -static void maybe_add_stream_for_extraction(struct wim_lookup_table_entry *lte, - struct list_head *stream_list) +static void +maybe_add_stream_for_extraction(struct wim_lookup_table_entry *lte, + struct list_head *stream_list) { if (++lte->out_refcnt == 1) { INIT_LIST_HEAD(<e->inode_list); @@ -593,9 +659,10 @@ static void maybe_add_stream_for_extraction(struct wim_lookup_table_entry *lte, } } -static void inode_find_streams_for_extraction(struct wim_inode *inode, - struct list_head *stream_list, - int extract_flags) +static void +inode_find_streams_for_extraction(struct wim_inode *inode, + struct list_head *stream_list, + int extract_flags) { struct wim_lookup_table_entry *lte; bool inode_added = false; @@ -609,7 +676,7 @@ static void inode_find_streams_for_extraction(struct wim_inode *inode, #ifdef WITH_NTFS_3G if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { for (unsigned i = 0; i < inode->i_num_ads; i++) { - if (inode->i_ads_entries[i].stream_name_len != 0) { + if (inode->i_ads_entries[i].stream_name_nbytes != 0) { lte = inode->i_ads_entries[i].lte; if (lte) { maybe_add_stream_for_extraction(lte, @@ -626,10 +693,11 @@ static void inode_find_streams_for_extraction(struct wim_inode *inode, #endif } -static void find_streams_for_extraction(struct hlist_head *inode_list, - struct list_head *stream_list, - struct wim_lookup_table *lookup_table, - int extract_flags) +static void +find_streams_for_extraction(struct hlist_head *inode_list, + struct list_head *stream_list, + struct wim_lookup_table *lookup_table, + int extract_flags) { struct wim_inode *inode; struct hlist_node *cur; @@ -664,10 +732,11 @@ static const struct apply_operations ntfs_apply_operations = { }; #endif -static int apply_stream_list(struct list_head *stream_list, - struct apply_args *args, - const struct apply_operations *ops, - wimlib_progress_func_t progress_func) +static int +apply_stream_list(struct list_head *stream_list, + struct apply_args *args, + const struct apply_operations *ops, + wimlib_progress_func_t progress_func) { uint64_t bytes_per_progress = args->progress.extract.total_bytes / 100; uint64_t next_progress = bytes_per_progress; @@ -719,9 +788,10 @@ static int apply_stream_list(struct list_head *stream_list, /* Extracts the image @image from the WIM @w to the directory or NTFS volume * @target. */ -static int extract_single_image(WIMStruct *w, int image, - const char *target, int extract_flags, - wimlib_progress_func_t progress_func) +static int +extract_single_image(WIMStruct *w, int image, + const tchar *target, int extract_flags, + wimlib_progress_func_t progress_func) { int ret; struct list_head stream_list; @@ -730,12 +800,12 @@ static int extract_single_image(WIMStruct *w, int image, struct apply_args args; const struct apply_operations *ops; - args.w = w; - args.target = target; - args.extract_flags = extract_flags; - args.num_lutimes_warnings = 0; - args.stream_list = &stream_list; - args.progress_func = progress_func; + args.w = w; + args.target = target; + args.extract_flags = extract_flags; + args.num_utime_warnings = 0; + args.stream_list = &stream_list; + args.progress_func = progress_func; if (progress_func) { args.progress.extract.wimfile_name = w->filename; @@ -750,7 +820,8 @@ static int extract_single_image(WIMStruct *w, int image, if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { args.vol = ntfs_mount(target, 0); if (!args.vol) { - ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s'", target); + ERROR_WITH_ERRNO("Failed to mount NTFS volume `%"TS"'", + target); return WIMLIB_ERR_NTFS_3G; } ops = &ntfs_apply_operations; @@ -831,7 +902,8 @@ out: /* Unmount the NTFS volume */ if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { if (ntfs_umount(args.vol, FALSE) != 0) { - ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", args.target); + ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%"TS"'", + args.target); if (ret == 0) ret = WIMLIB_ERR_NTFS_3G; } @@ -840,33 +912,53 @@ out: return ret; } +static const tchar *filename_forbidden_chars = +T( +#ifdef __WIN32__ +"<>:\"/\\|?*" +#else +"/" +#endif +); + +/* This function checks if it is okay to use a WIM image's name as a directory + * name. */ +static bool +image_name_ok_as_dir(const tchar *image_name) +{ + return image_name && *image_name && + !tstrpbrk(image_name, filename_forbidden_chars); +} /* Extracts all images from the WIM to the directory @target, with the images * placed in subdirectories named by their image names. */ -static int extract_all_images(WIMStruct *w, const char *target, - int extract_flags, - wimlib_progress_func_t progress_func) +static int +extract_all_images(WIMStruct *w, + const tchar *target, + int extract_flags, + wimlib_progress_func_t progress_func) { size_t image_name_max_len = max(xml_get_max_image_name_len(w), 20); - size_t output_path_len = strlen(target); - char buf[output_path_len + 1 + image_name_max_len + 1]; + size_t output_path_len = tstrlen(target); + tchar buf[output_path_len + 1 + image_name_max_len + 1]; int ret; int image; - const char *image_name; + const tchar *image_name; ret = extract_directory(NULL, target, true); - if (ret != 0) + if (ret) return ret; - memcpy(buf, target, output_path_len); - buf[output_path_len] = '/'; + tmemcpy(buf, target, output_path_len); + buf[output_path_len] = T('/'); for (image = 1; image <= w->hdr.image_count; image++) { image_name = wimlib_get_image_name(w, image); - if (image_name && *image_name) { - strcpy(buf + output_path_len + 1, image_name); + if (image_name_ok_as_dir(image_name)) { + tstrcpy(buf + output_path_len + 1, image_name); } else { - /* Image name is empty. Use image number instead */ - sprintf(buf + output_path_len + 1, "%d", image); + /* Image name is empty, or contains forbidden + * characters. */ + tsprintf(buf + output_path_len + 1, T("%d"), image); } ret = extract_single_image(w, image, buf, extract_flags, progress_func); @@ -878,13 +970,14 @@ static int extract_all_images(WIMStruct *w, const char *target, /* Extracts a single image or all images from a WIM file to a directory or NTFS * volume. */ -WIMLIBAPI int wimlib_extract_image(WIMStruct *w, - int image, - const char *target, - int extract_flags, - WIMStruct **additional_swms, - unsigned num_additional_swms, - wimlib_progress_func_t progress_func) +WIMLIBAPI int +wimlib_extract_image(WIMStruct *w, + int image, + const tchar *target, + int extract_flags, + WIMStruct **additional_swms, + unsigned num_additional_swms, + wimlib_progress_func_t progress_func) { struct wim_lookup_table *joined_tab, *w_tab_save; int ret; @@ -945,9 +1038,6 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, w->lookup_table = joined_tab; } -#ifdef __WIN32__ - win32_acquire_restore_privileges(); -#endif if (image == WIMLIB_ALL_IMAGES) { extract_flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; ret = extract_all_images(w, target, extract_flags, @@ -957,9 +1047,6 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, ret = extract_single_image(w, image, target, extract_flags, progress_func); } -#ifdef __WIN32__ - win32_release_restore_privileges(); -#endif if (extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK))