X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract_image.c;h=cd23e45d4b4cf050da22bb1ae1ca431f7c761255;hp=8d21edaca0cafa3a108ab83bbe2747e9b1e07916;hb=a4afe5a6e7fc70b3e73022f4911e7a60d67a7675;hpb=2d50f9e33814102747da848933793cfdf33c09a0 diff --git a/src/extract_image.c b/src/extract_image.c index 8d21edac..cd23e45d 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,268 +25,71 @@ #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; -} - +#ifndef __WIN32__ -static int win32_extract_chunk(const u8 *buf, size_t len, u64 offset, void *arg) +/* Returns the number of components of @path. */ +static unsigned +get_num_path_components(const char *path) { - 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; + unsigned num_components = 0; + while (*path) { + while (*path == '/') + path++; + if (*path) + num_components++; + while (*path && *path != '/') + path++; } - return 0; + return num_components; } -static int do_win32_extract_stream(HANDLE hStream, struct wim_lookup_table_entry *lte) +static const char * +path_next_part(const char *path) { - return extract_wim_resource(lte, wim_resource_size(lte), - win32_extract_chunk, hStream); + while (*path && *path != '/') + path++; + while (*path && *path == '/') + path++; + return path; } -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 -static int extract_regular_file_linked(struct wim_dentry *dentry, - const char *output_path, - struct apply_args *args, - struct wim_lookup_table_entry *lte) +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 @@ -313,10 +111,8 @@ static int extract_regular_file_linked(struct wim_dentry *dentry, const char *p2; size_t i; - num_path_components = - get_num_path_components(dentry->full_path_utf8) - 1; - num_output_dir_path_components = - get_num_path_components(args->target); + num_path_components = get_num_path_components(dentry->_full_path) - 1; + num_output_dir_path_components = get_num_path_components(args->target); if (args->extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) { num_path_components++; @@ -335,12 +131,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; } @@ -348,52 +145,61 @@ 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) { /* Ignore */ - WARNING_WITH_ERRNO("failed to set symlink UNIX owner/group"); + WARNING_WITH_ERRNO("failed to set symlink UNIX " + "owner/group on \"%s\"", link); } else { - ERROR_WITH_ERRNO("failed to set symlink UNIX owner/group"); + ERROR_WITH_ERRNO("failed to set symlink UNIX " + "owner/group on \"%s\"", link); return WIMLIB_ERR_INVALID_DENTRY; } } 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 char *path, + const struct wimlib_unix_data *unix_data) { if (fchown(fd, unix_data->uid, unix_data->gid)) { if (errno == EPERM) { - WARNING_WITH_ERRNO("failed to set file UNIX owner/group"); + WARNING_WITH_ERRNO("failed to set file UNIX " + "owner/group on \"%s\"", path); /* Ignore? */ } else { - ERROR_WITH_ERRNO("failed to set file UNIX owner/group"); + ERROR_WITH_ERRNO("failed to set file UNIX " + "owner/group on \"%s\"", path); return WIMLIB_ERR_INVALID_DENTRY; } } if (fchmod(fd, unix_data->mode)) { if (errno == EPERM) { - WARNING_WITH_ERRNO("failed to set UNIX file mode"); + WARNING_WITH_ERRNO("failed to set UNIX file mode " + "on \"%s\"", path); /* Ignore? */ } else { - ERROR_WITH_ERRNO("failed to set UNIX file mode"); + ERROR_WITH_ERRNO("failed to set UNIX file mode " + "on \"%s\"", path); return WIMLIB_ERR_INVALID_DENTRY; } } 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; if (dfd >= 0) { - ret = fd_apply_unix_data(dfd, unix_data); + ret = fd_apply_unix_data(dfd, dir, unix_data); if (close(dfd)) { ERROR_WITH_ERRNO("can't close directory `%s'", dir); ret = WIMLIB_ERR_MKDIR; @@ -405,10 +211,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. */ @@ -466,7 +273,7 @@ static int extract_regular_file_unlinked(struct wim_dentry *dentry, } ret = extract_wim_resource_to_fd(lte, out_fd, wim_resource_size(lte)); - if (ret != 0) { + if (ret) { ERROR("Failed to extract resource to `%s'", output_path); goto out; } @@ -480,8 +287,8 @@ out_extract_unix_data: else if (ret < 0) ret = 0; else - ret = fd_apply_unix_data(out_fd, &unix_data); - if (ret != 0) + ret = fd_apply_unix_data(out_fd, output_path, &unix_data); + if (ret) goto out; } if (lte) @@ -495,9 +302,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; @@ -518,77 +326,96 @@ 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, - sizeof(target), args->w, 0); + char target[4096 + args->target_realpath_len]; + char *fixed_target; + const struct wim_inode *inode = dentry->d_inode; + + ssize_t ret = wim_inode_readlink(inode, + target + args->target_realpath_len, + sizeof(target) - args->target_realpath_len - 1); struct wim_lookup_table_entry *lte; 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); - if (ret != 0) { + target[args->target_realpath_len + ret] = '\0'; + if (target[args->target_realpath_len] == '/' && + args->extract_flags & WIMLIB_EXTRACT_FLAG_RPFIX) + { + /* Fix absolute symbolic link target to point into the actual + * extraction destination */ + memcpy(target, args->target_realpath, + args->target_realpath_len); + fixed_target = target; + } else { + /* Keep same link target */ + fixed_target = target + args->target_realpath_len; + } + ret = symlink(fixed_target, output_path); + if (ret) { ERROR_WITH_ERRNO("Failed to symlink `%s' to `%s'", - output_path, target); + output_path, fixed_target); return WIMLIB_ERR_LINK; } - lte = inode_unnamed_lte_resolved(dentry->d_inode); - wimlib_assert(lte != NULL); if (args->extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA) { struct wimlib_unix_data unix_data; - ret = inode_get_unix_data(dentry->d_inode, &unix_data, NULL); + ret = inode_get_unix_data(inode, &unix_data, NULL); if (ret > 0) ; else if (ret < 0) ret = 0; else ret = symlink_apply_unix_data(output_path, &unix_data); - if (ret != 0) + if (ret) return ret; } + lte = inode_unnamed_lte_resolved(inode); + wimlib_assert(lte != NULL); args->progress.extract.completed_bytes += wim_resource_size(lte); return 0; } -#endif /* !__CYGWIN__ && !__WIN32__ */ +#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: 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,80 +430,13 @@ dir_exists: return ret; } -/* Extracts a file, directory, or symbolic link from the WIM archive. */ -static int apply_dentry_normal(struct wim_dentry *dentry, void *arg) +#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) { - struct apply_args *args = arg; - struct wim_inode *inode = dentry->d_inode; - size_t len; - char *output_path; - - 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; - } - -#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;*/ - /*}*/ + const struct wim_inode *inode = dentry->d_inode; - 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; -#else if (inode_is_symlink(inode)) return extract_symlink(dentry, args, output_path); else if (inode_is_directory(inode)) @@ -685,103 +445,128 @@ out_free_utf16_path: output_path, false); else return extract_regular_file(dentry, args, output_path); -#endif } -/* Apply timestamps to an extracted file or directory */ -static int apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg) +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) { - 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; + const struct wim_inode *inode = dentry->d_inode; - 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; +#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. */ - ret = utf8_to_utf16(output_path, len + dentry->full_path_utf8_len, - &utf16_path, &utf16_path_len); + 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) - 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; - } - return 0; -fail: - err = GetLastError(); - ERROR("Can't set timestamps on \"%s\"", output_path); - win32_error(err); - return WIMLIB_ERR_WRITE; + ret = errno; #else - /* UNIX */ + ret = ENOSYS; +#endif - /* 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]); + 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 != 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 == 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; + size_t len; + tchar *output_path; + + len = tstrlen(args->target); + if (dentry_is_root(dentry)) { + output_path = (tchar*)args->target; + } else { + 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); +#else + return unix_do_apply_dentry(output_path, len, dentry, args); #endif } -/* 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) + +/* 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; + tchar *output_path; + + len = tstrlen(args->target); + if (dentry_is_root(dentry)) { + output_path = (tchar*)args->target; + } else { + 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 + return unix_do_apply_dentry_timestamps(output_path, len, dentry, args); +#endif +} + +/* Extract a dentry if it hasn't already been extracted and either + * WIMLIB_EXTRACT_FLAG_NO_STREAMS is not specified, or the dentry is a directory + * and/or has no unnamed stream. */ +static int +maybe_apply_dentry(struct wim_dentry *dentry, void *arg) { struct apply_args *args = arg; int ret; @@ -789,13 +574,14 @@ static int maybe_apply_dentry(struct wim_dentry *dentry, void *arg) if (dentry->is_extracted) return 0; - if (args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS) - if (inode_unnamed_lte_resolved(dentry->d_inode)) - return 0; + if (args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS && + !dentry_is_directory(dentry) && + inode_unnamed_lte_resolved(dentry->d_inode) != NULL) + return 0; 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); } @@ -805,62 +591,17 @@ 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) -{ - const struct wim_lookup_table_entry *lte1, *lte2; - lte1 = *(const struct wim_lookup_table_entry**)p1; - lte2 = *(const struct wim_lookup_table_entry**)p2; - if (lte1->resource_entry.offset < lte2->resource_entry.offset) - return -1; - else if (lte1->resource_entry.offset > lte2->resource_entry.offset) - return 1; - else - return 0; -} - -static int sort_stream_list_by_wim_position(struct list_head *stream_list) -{ - struct list_head *cur; - size_t num_streams; - struct wim_lookup_table_entry **array; - size_t i; - size_t array_size; - - num_streams = 0; - list_for_each(cur, stream_list) - num_streams++; - array_size = num_streams * sizeof(array[0]); - array = MALLOC(array_size); - if (!array) { - ERROR("Failed to allocate %zu bytes to sort stream entries", - array_size); - return WIMLIB_ERR_NOMEM; - } - cur = stream_list->next; - for (i = 0; i < num_streams; i++) { - array[i] = container_of(cur, struct wim_lookup_table_entry, staging_list); - cur = cur->next; - } - - qsort(array, num_streams, sizeof(array[0]), cmp_streams_by_wim_position); - - INIT_LIST_HEAD(stream_list); - for (i = 0; i < num_streams; i++) - list_add_tail(&array[i]->staging_list, stream_list); - FREE(array); - 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; u64 num_streams = 0; /* For each stream to be extracted... */ - list_for_each_entry(lte, stream_list, staging_list) { + list_for_each_entry(lte, stream_list, extraction_list) { if (extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) { @@ -882,18 +623,20 @@ 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); - list_add_tail(<e->staging_list, stream_list); + list_add_tail(<e->extraction_list, stream_list); } } -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; @@ -904,10 +647,23 @@ static void inode_find_streams_for_extraction(struct wim_inode *inode, list_add_tail(&inode->i_lte_inode_list, <e->inode_list); inode_added = true; } -#ifdef WITH_NTFS_3G - if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { + + /* Determine whether to include alternate data stream entries or not. + * + * UNIX: Include them if extracting using NTFS-3g. + * + * Windows: Include them undconditionally, although if the filesystem is + * not NTFS we won't actually be able to extract them. */ +#if defined(WITH_NTFS_3G) + if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) +#elif defined(__WIN32__) + if (1) +#else + if (0) +#endif + { 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, @@ -921,21 +677,20 @@ 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 wim_image_metadata *imd, + struct list_head *stream_list, + struct wim_lookup_table *lookup_table, + int extract_flags) { struct wim_inode *inode; - struct hlist_node *cur; struct wim_dentry *dentry; for_lookup_table_entry(lookup_table, lte_zero_out_refcnt, NULL); INIT_LIST_HEAD(stream_list); - hlist_for_each_entry(inode, cur, inode_list, i_hlist) { + image_for_each_inode(inode, imd) { if (!inode->i_resolved) inode_resolve_ltes(inode, lookup_table); inode_for_each_dentry(dentry, inode) @@ -962,10 +717,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; @@ -983,7 +739,7 @@ static int apply_stream_list(struct list_head *stream_list, * sequential reading of the WIM can be implemented. */ /* For each distinct stream to be extracted */ - list_for_each_entry(lte, stream_list, staging_list) { + list_for_each_entry(lte, stream_list, extraction_list) { /* For each inode that contains the stream */ list_for_each_entry(inode, <e->inode_list, i_lte_inode_list) { /* For each dentry that points to the inode */ @@ -991,7 +747,7 @@ static int apply_stream_list(struct list_head *stream_list, /* Extract the dentry if it was not already * extracted */ ret = maybe_apply_dentry(dentry, args); - if (ret != 0) + if (ret) return ret; if (progress_func && args->progress.extract.completed_bytes >= next_progress) @@ -1015,25 +771,60 @@ static int apply_stream_list(struct list_head *stream_list, return 0; } +static int +sort_stream_list_by_wim_position(struct list_head *stream_list) +{ + struct list_head *cur; + size_t num_streams; + struct wim_lookup_table_entry **array; + size_t i; + size_t array_size; + + num_streams = 0; + list_for_each(cur, stream_list) + num_streams++; + array_size = num_streams * sizeof(array[0]); + array = MALLOC(array_size); + if (!array) { + ERROR("Failed to allocate %zu bytes to sort stream entries", + array_size); + return WIMLIB_ERR_NOMEM; + } + cur = stream_list->next; + for (i = 0; i < num_streams; i++) { + array[i] = container_of(cur, struct wim_lookup_table_entry, extraction_list); + cur = cur->next; + } + + qsort(array, num_streams, sizeof(array[0]), cmp_streams_by_wim_position); + + INIT_LIST_HEAD(stream_list); + for (i = 0; i < num_streams; i++) + list_add_tail(&array[i]->extraction_list, stream_list); + FREE(array); + return 0; +} + + /* 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; - struct hlist_head *inode_list; 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; + memset(&args, 0, sizeof(args)); + + args.w = w; + args.target = target; + args.extract_flags = extract_flags; + args.progress_func = progress_func; if (progress_func) { args.progress.extract.wimfile_name = w->filename; @@ -1048,7 +839,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; @@ -1057,13 +849,12 @@ static int extract_single_image(WIMStruct *w, int image, ops = &normal_apply_operations; ret = select_wim_image(w, image); - if (ret != 0) + if (ret) goto out; - inode_list = &w->image_metadata[image - 1].inode_list; - /* Build a list of the streams that need to be extracted */ - find_streams_for_extraction(inode_list, &stream_list, + find_streams_for_extraction(wim_get_current_image_metadata(w), + &stream_list, w->lookup_table, extract_flags); /* Calculate the number of bytes of data that will be extracted */ @@ -1091,12 +882,16 @@ static int extract_single_image(WIMStruct *w, int image, &args.progress); } + ret = calculate_dentry_tree_full_paths(wim_root_dentry(w)); + if (ret) + goto out; + /* Make the directory structure and extract empty files */ args.extract_flags |= WIMLIB_EXTRACT_FLAG_NO_STREAMS; args.apply_dentry = ops->apply_dentry; ret = for_dentry_in_tree(wim_root_dentry(w), maybe_apply_dentry, &args); args.extract_flags &= ~WIMLIB_EXTRACT_FLAG_NO_STREAMS; - if (ret != 0) + if (ret) goto out; if (progress_func) { @@ -1104,10 +899,17 @@ static int extract_single_image(WIMStruct *w, int image, &args.progress); } + if (extract_flags & WIMLIB_EXTRACT_FLAG_RPFIX) { + args.target_realpath = realpath(target, NULL); + if (!args.target_realpath) + return WIMLIB_ERR_NOMEM; + args.target_realpath_len = tstrlen(args.target_realpath); + } + /* Extract non-empty files */ ret = apply_stream_list(&stream_list, &args, ops, progress_func); - if (ret != 0) - goto out; + if (ret) + goto out_free_target_realpath; if (progress_func) { progress_func(WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS, @@ -1117,19 +919,22 @@ static int extract_single_image(WIMStruct *w, int image, /* Apply timestamps */ ret = for_dentry_in_tree_depth(wim_root_dentry(w), ops->apply_dentry_timestamps, &args); - if (ret != 0) - goto out; + if (ret) + goto out_free_target_realpath; if (progress_func) { progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END, &args.progress); } +out_free_target_realpath: + FREE(args.target_realpath); out: #ifdef WITH_NTFS_3G /* 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; } @@ -1138,33 +943,53 @@ out: return ret; } +static const tchar * const 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); @@ -1176,13 +1001,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; @@ -1196,7 +1022,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; @@ -1230,14 +1056,31 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, #endif } + if ((extract_flags & (WIMLIB_EXTRACT_FLAG_RPFIX | + WIMLIB_EXTRACT_FLAG_RPFIX)) == + (WIMLIB_EXTRACT_FLAG_RPFIX | WIMLIB_EXTRACT_FLAG_NORPFIX)) + { + ERROR("Cannot specify RPFIX and NORPFIX flags at the same time!"); + return WIMLIB_ERR_INVALID_PARAM; + } + + if ((extract_flags & (WIMLIB_EXTRACT_FLAG_RPFIX | + WIMLIB_EXTRACT_FLAG_NORPFIX)) == 0) + if (w->hdr.flags & WIM_HDR_FLAG_RP_FIX) + extract_flags |= WIMLIB_EXTRACT_FLAG_RPFIX; + ret = verify_swm_set(w, additional_swms, num_additional_swms); - if (ret != 0) + if (ret) + return ret; + + ret = wim_checksum_unhashed_streams(w); + if (ret) return ret; if (num_additional_swms) { ret = new_joined_lookup_table(w, additional_swms, num_additional_swms, &joined_tab); - if (ret != 0) + if (ret) return ret; w_tab_save = w->lookup_table; w->lookup_table = joined_tab;