X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract_image.c;h=19b87d4dc7230d52581df2d8ca560b8006577c46;hp=8d21edaca0cafa3a108ab83bbe2747e9b1e07916;hb=7acdc3aecd7ce546727ae8239e0d942c2a00db43;hpb=2d50f9e33814102747da848933793cfdf33c09a0 diff --git a/src/extract_image.c b/src/extract_image.c index 8d21edac..19b87d4d 100644 --- a/src/extract_image.c +++ b/src/extract_image.c @@ -2,11 +2,6 @@ * extract_image.c * * Support for extracting WIM files. - * - * This code does NOT contain any filesystem-specific features. In particular, - * security information (i.e. file permissions) and alternate data streams are - * ignored, except possibly to read an alternate data stream that contains - * symbolic link data. */ /* @@ -30,264 +25,39 @@ #include "config.h" -#if defined(__CYGWIN__) || defined(__WIN32__) -#include -# ifdef ERROR -# undef ERROR -# endif -#include +#include + +#ifdef __WIN32__ +# include "win32.h" +#else +# ifdef HAVE_UTIME_H +# include +# endif +# include "timestamp.h" +# include #endif -#include #include #include +#include #include #include -#include -#include - -#ifdef HAVE_UTIME_H -#include -#endif - #include #include "dentry.h" #include "lookup_table.h" -#include "timestamp.h" #include "wimlib_internal.h" #include "xml.h" #ifdef WITH_NTFS_3G -#include +# include #endif #ifdef HAVE_ALLOCA_H -#include -#else -#include +# include #endif -#if defined(__CYGWIN__) || defined(__WIN32__) - -static int win32_set_reparse_data(HANDLE h, - u32 reparse_tag, - const struct wim_lookup_table_entry *lte, - const wchar_t *path, - const char *path_utf8) -{ - int ret; - u8 *buf; - size_t len; - - if (!lte) { - WARNING("\"%s\" is marked as a reparse point but had no reparse data", - path_utf8); - return 0; - } - len = wim_resource_size(lte); - if (len > 16 * 1024 - 8) { - WARNING("\"%s\": reparse data too long!", path_utf8); - return 0; - } - buf = alloca(len + 8); - ret = read_full_wim_resource(lte, buf + 8, 0); - if (ret) - return ret; - *(u32*)(buf + 0) = reparse_tag; - *(u16*)(buf + 4) = len; - if (!DeviceIoControl(h, FSCTL_SET_REPARSE_POINT, buf, len + 8, - NULL, 0, NULL, NULL)) - { - DWORD err = GetLastError(); - ERROR("Failed to set reparse data on \"%s\"", - path_utf8); - win32_error(err); - ret = WIMLIB_ERR_WRITE; - } else - ret = 0; - return ret; -} - - -static int win32_extract_chunk(const u8 *buf, size_t len, u64 offset, void *arg) -{ - HANDLE hStream = arg; - - DWORD nbytes_written; - wimlib_assert(len <= 0xffffffff); - - if (!WriteFile(hStream, buf, len, &nbytes_written, NULL) || - nbytes_written != len) - { - DWORD err = GetLastError(); - ERROR("WriteFile(): write error"); - win32_error(err); - return WIMLIB_ERR_WRITE; - } - return 0; -} - -static int do_win32_extract_stream(HANDLE hStream, struct wim_lookup_table_entry *lte) -{ - return extract_wim_resource(lte, wim_resource_size(lte), - win32_extract_chunk, hStream); -} - -static int win32_extract_stream(const struct wim_inode *inode, - const wchar_t *path, - const wchar_t *stream_name_utf16, - struct wim_lookup_table_entry *lte, - const char *path_utf8) -{ - wchar_t *stream_path; - HANDLE h; - int ret; - DWORD err; - DWORD creationDisposition = CREATE_ALWAYS; - - if (stream_name_utf16) { - size_t stream_path_nchars; - size_t path_nchars = wcslen(path); - size_t stream_name_nchars = wcslen(stream_name_utf16); - - stream_path_nchars = path_nchars + 1 + stream_name_nchars; - - stream_path = alloca((stream_path_nchars + 1) * sizeof(wchar_t)); - - memcpy(stream_path, path, path_nchars * sizeof(wchar_t)); - stream_path[path_nchars] = L':'; - memcpy(&stream_path[path_nchars + 1], stream_name_utf16, - stream_name_nchars * sizeof(wchar_t)); - stream_path[stream_path_nchars] = L'\0'; - - /*wsprintf(stream_path, stream_path_nchars, L"%ls:%ls",*/ - /*path, stream_name_utf16);*/ - } else { - stream_path = (wchar_t*)path; - if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) { - if (!CreateDirectoryW(stream_path, NULL)) { - err = GetLastError(); - if (err == ERROR_FILE_EXISTS && - dentry_is_root(inode_first_dentry(inode))) - { - /* Already exists */ - return 0; - } - ERROR("Failed to create directory \"%s\"", path_utf8); - win32_error(err); - ret = WIMLIB_ERR_MKDIR; - goto fail; - } - creationDisposition = OPEN_EXISTING; - } - } - - h = CreateFileW(stream_path, - GENERIC_WRITE | WRITE_OWNER | WRITE_DAC, - 0, - NULL, - creationDisposition, - FILE_FLAG_OPEN_REPARSE_POINT | - FILE_FLAG_BACKUP_SEMANTICS | - inode->i_attributes, - NULL); - if (h == INVALID_HANDLE_VALUE) { - err = GetLastError(); - if (err == ERROR_FILE_EXISTS && - dentry_is_root(inode_first_dentry(inode))) - { - /* Already exists */ - return 0; - } - ERROR("Failed to create \"%s\"", path_utf8); - win32_error(err); - ret = WIMLIB_ERR_OPEN; - goto fail; - } - - if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) { - DEBUG("Setting reparse data on \"%s\"", path_utf8); - ret = win32_set_reparse_data(h, inode->i_reparse_tag, - lte, path, path_utf8); - if (ret) - goto fail_close_handle; - } else { - if (lte) { - DEBUG("Extracting stream for \"%s\" (len = %zu)", - path_utf8, wim_resource_size(lte)); - ret = do_win32_extract_stream(h, lte); - if (ret) - goto fail_close_handle; - } - } - - if (!CloseHandle(h)) { - err = GetLastError(); - ERROR("Failed to close \"%s\"", path_utf8); - win32_error(err); - ret = WIMLIB_ERR_WRITE; - goto fail; - } - ret = 0; - goto out; -fail_close_handle: - CloseHandle(h); -fail: - ERROR("Error extracting %s", path_utf8); -out: - return ret; -} - -static int win32_extract_streams(struct wim_inode *inode, - const wchar_t *path, - const char *path_utf8) -{ - struct wim_lookup_table_entry *unnamed_lte; - int ret; - - ret = win32_extract_stream(inode, path, NULL, unnamed_lte, path_utf8); - if (ret) - goto out; - - for (u16 i = 0; i < inode->i_num_ads; i++) { - const struct wim_ads_entry *ads_entry = &inode->i_ads_entries[i]; - if (ads_entry->stream_name_len != 0) { - ret = win32_extract_stream(inode, - path, - (const wchar_t*)ads_entry->stream_name, - ads_entry->lte, - path_utf8); - if (ret) - goto out; - } - } - ret = 0; -out: - return ret; -} - -static int win32_set_security_data(const struct wim_inode *inode, - const wchar_t *path, - const struct wim_security_data *sd, - const char *path_utf8) -{ - SECURITY_INFORMATION securityInformation = DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION | - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION; - if (!SetFileSecurityW(path, securityInformation, - (PSECURITY_DESCRIPTOR)sd->descriptors[inode->i_security_id])) - { - DWORD err = GetLastError(); - ERROR("Can't set security descriptor on \"%s\"", path_utf8); - win32_error(err); - return WIMLIB_ERR_WRITE; - } - return 0; -} - -#else +#ifndef __WIN32__ static int extract_regular_file_linked(struct wim_dentry *dentry, const char *output_path, struct apply_args *args, @@ -556,7 +326,7 @@ static int extract_symlink(struct wim_dentry *dentry, return 0; } -#endif /* !__CYGWIN__ && !__WIN32__ */ +#endif /* !__WIN32__ */ static int extract_directory(struct wim_dentry *dentry, const char *output_path, bool is_root) @@ -588,7 +358,7 @@ static int extract_directory(struct wim_dentry *dentry, } dir_exists: ret = 0; -#if !defined(__CYGWIN__) && !defined(__WIN32__) +#ifndef __WIN32__ if (dentry) { struct wimlib_unix_data unix_data; ret = inode_get_unix_data(dentry->d_inode, &unix_data, NULL); @@ -603,11 +373,88 @@ dir_exists: return ret; } +#ifndef __WIN32__ +static int unix_do_apply_dentry(const char *output_path, + size_t output_path_len, + struct wim_dentry *dentry, + struct apply_args *args) +{ + const struct wim_inode *inode = dentry->d_inode; + + if (inode_is_symlink(inode)) + return extract_symlink(dentry, args, output_path); + else if (inode_is_directory(inode)) + return extract_directory((args->extract_flags & + WIMLIB_EXTRACT_FLAG_UNIX_DATA) ? dentry : NULL, + output_path, false); + else + 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) +{ + 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 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 + /* 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 && 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) { struct apply_args *args = arg; - struct wim_inode *inode = dentry->d_inode; size_t len; char *output_path; @@ -621,161 +468,35 @@ static int apply_dentry_normal(struct wim_dentry *dentry, void *arg) output_path[len + dentry->full_path_utf8_len] = '\0'; len += dentry->full_path_utf8_len; } - -#if defined(__CYGWIN__) || defined(__WIN32__) - char *utf16_path; - size_t utf16_path_len; - DWORD err; - int ret; - ret = utf8_to_utf16(output_path, len, &utf16_path, &utf16_path_len); - if (ret) - return ret; - - if (inode->i_nlink > 1 && inode->i_extracted_file != NULL) { - /* Linked file, with another name already extracted */ - if (!CreateHardLinkW((const wchar_t*)inode->i_extracted_file, - (const wchar_t*)utf16_path, - NULL)) - { - err = GetLastError(); - ERROR("Can't create hard link \"%s\"", output_path); - ret = WIMLIB_ERR_LINK; - win32_error(err); - goto out_free_utf16_path; - } - ret = 0; - goto out_free_utf16_path; - } - ret = win32_extract_streams(inode, (const wchar_t*)utf16_path, - output_path); - if (ret) - goto out_free_utf16_path; - - if (inode->i_security_id != -1) { - DEBUG("Setting security descriptor %d on %s", - inode->i_security_id, output_path); - ret = win32_set_security_data(inode, - (const wchar_t*)utf16_path, - wim_const_security_data(args->w), - output_path); - if (ret) - goto out_free_utf16_path; - } - - /*if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {*/ - /*ret = win32_set_reparse_data(inode, path, output_path);*/ - /*if (ret)*/ - /*goto out_free_utf16_path;*/ - /*}*/ - - if (inode->i_nlink > 1) { - inode->i_extracted_file = utf16_path; - utf16_path = NULL; - } - ret = 0; -out_free_utf16_path: - FREE(utf16_path); - return ret; +#ifdef __WIN32__ + return win32_do_apply_dentry(output_path, len, dentry, args); #else - if (inode_is_symlink(inode)) - return extract_symlink(dentry, args, output_path); - else if (inode_is_directory(inode)) - return extract_directory((args->extract_flags & - WIMLIB_EXTRACT_FLAG_UNIX_DATA) ? dentry : NULL, - output_path, false); - else - return extract_regular_file(dentry, args, output_path); + return unix_do_apply_dentry(output_path, len, dentry, args); #endif } + /* Apply timestamps to an extracted file or directory */ static int apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg) { struct apply_args *args = arg; - size_t len = strlen(args->target); - char output_path[len + dentry->full_path_utf8_len + 1]; - const struct wim_inode *inode = dentry->d_inode; - int ret; - - 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'; - -#if defined(__CYGWIN__) || defined(__WIN32__) - /* Win32 */ - char *utf16_path; - size_t utf16_path_len; - DWORD err; - HANDLE h; - BOOL bret1, bret2; + size_t len; + char *output_path; - ret = utf8_to_utf16(output_path, len + dentry->full_path_utf8_len, - &utf16_path, &utf16_path_len); - if (ret) - return ret; - h = CreateFile(utf16_path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, - NULL); - - if (h == INVALID_HANDLE_VALUE) - err = GetLastError(); - FREE(utf16_path); - if (h == INVALID_HANDLE_VALUE) - goto fail; - - FILETIME creationTime = {.dwLowDateTime = dentry->d_inode->i_creation_time & 0xffffffff, - .dwHighDateTime = dentry->d_inode->i_creation_time >> 32}; - FILETIME lastAccessTime = {.dwLowDateTime = dentry->d_inode->i_last_access_time & 0xffffffff, - .dwHighDateTime = dentry->d_inode->i_last_access_time >> 32}; - FILETIME lastWriteTime = {.dwLowDateTime = dentry->d_inode->i_last_write_time & 0xffffffff, - .dwHighDateTime = dentry->d_inode->i_last_write_time >> 32}; - - if (!SetFileTime(h, &creationTime, &lastAccessTime, &lastWriteTime)) { - err = GetLastError(); - CloseHandle(h); - goto fail; - } - if (!CloseHandle(h)) { - err = GetLastError(); - goto fail; + len = strlen(args->target); + if (dentry_is_root(dentry)) { + output_path = (char*)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; } - return 0; -fail: - err = GetLastError(); - ERROR("Can't set timestamps on \"%s\"", output_path); - win32_error(err); - return WIMLIB_ERR_WRITE; +#ifdef __WIN32__ + return win32_do_apply_dentry_timestamps(output_path, len, dentry, args); #else - /* UNIX */ - - /* 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]); - #ifdef HAVE_LUTIMES - ret = lutimes(output_path, tv); - #else - ret = -1; - errno = ENOSYS; - #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++; - } - } - return 0; + return unix_do_apply_dentry_timestamps(output_path, len, dentry, args); #endif } @@ -1028,12 +749,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; @@ -1196,7 +917,7 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, == (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) return WIMLIB_ERR_INVALID_PARAM; -#if defined(__CYGWIN__) || defined(__WIN32__) +#ifdef __WIN32__ if (extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA) { ERROR("Extracting UNIX data is not supported on Windows"); return WIMLIB_ERR_INVALID_PARAM; @@ -1243,6 +964,9 @@ 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, @@ -1252,6 +976,9 @@ 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))