From: Eric Biggers Date: Thu, 15 May 2014 04:48:17 +0000 (-0500) Subject: Move code from win32_common.c to win32_apply.c X-Git-Tag: v1.7.0~145 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=59e242481e2f0d31bfe2a8222cbc87741487b2c2 Move code from win32_common.c to win32_apply.c --- diff --git a/include/wimlib/win32_common.h b/include/wimlib/win32_common.h index 4e2d7915..6749256e 100644 --- a/include/wimlib/win32_common.h +++ b/include/wimlib/win32_common.h @@ -21,13 +21,6 @@ set_errno_from_win32_error(DWORD err); extern void set_errno_from_nt_status(NTSTATUS status); -extern bool -win32_path_is_root_of_drive(const wchar_t *path); - -extern int -win32_get_vol_flags(const wchar_t *path, unsigned *vol_flags_ret, - bool *supports_SetFileShortName_ret); - extern HANDLE win32_open_existing_file(const wchar_t *path, DWORD dwDesiredAccess); diff --git a/src/win32_apply.c b/src/win32_apply.c index 3c09f9a8..d7442686 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -147,6 +147,125 @@ hash_lookup_table(WIMStruct *wim, u8 hash[SHA1_HASH_SIZE]) return wim_reshdr_to_hash(&wim->hdr.lookup_table_reshdr, wim, hash); } +/* Given a Windows-style path, return the number of characters of the prefix + * that specify the path to the root directory of a drive, or return 0 if the + * drive is relative (or at least on the current drive, in the case of + * absolute-but-not-really-absolute paths like \Windows\System32) */ +static size_t +win32_path_drive_spec_len(const wchar_t *path) +{ + size_t n = 0; + + if (!wcsncmp(path, L"\\\\?\\", 4)) { + /* \\?\-prefixed path. Check for following drive letter and + * path separator. */ + if (path[4] != L'\0' && path[5] == L':' && + is_any_path_separator(path[6])) + n = 7; + } else { + /* Not a \\?\-prefixed path. Check for an initial drive letter + * and path separator. */ + if (path[0] != L'\0' && path[1] == L':' && + is_any_path_separator(path[2])) + n = 3; + } + /* Include any additional path separators.*/ + if (n > 0) + while (is_any_path_separator(path[n])) + n++; + return n; +} + +static bool +win32_path_is_root_of_drive(const wchar_t *path) +{ + size_t drive_spec_len; + wchar_t full_path[32768]; + DWORD ret; + + ret = GetFullPathName(path, ARRAY_LEN(full_path), full_path, NULL); + if (ret > 0 && ret < ARRAY_LEN(full_path)) + path = full_path; + + /* Explicit drive letter and path separator? */ + drive_spec_len = win32_path_drive_spec_len(path); + if (drive_spec_len > 0 && path[drive_spec_len] == L'\0') + return true; + + /* All path separators? */ + for (const wchar_t *p = path; *p != L'\0'; p++) + if (!is_any_path_separator(*p)) + return false; + return true; +} + +/* Given a path, which may not yet exist, get a set of flags that describe the + * features of the volume the path is on. */ +static int +win32_get_vol_flags(const wchar_t *path, unsigned *vol_flags_ret, + bool *supports_SetFileShortName_ret) +{ + wchar_t *volume; + BOOL bret; + DWORD vol_flags; + size_t drive_spec_len; + wchar_t filesystem_name[MAX_PATH + 1]; + + if (supports_SetFileShortName_ret) + *supports_SetFileShortName_ret = false; + + drive_spec_len = win32_path_drive_spec_len(path); + + if (drive_spec_len == 0) + if (path[0] != L'\0' && path[1] == L':') /* Drive-relative path? */ + drive_spec_len = 2; + + if (drive_spec_len == 0) { + /* Path does not start with a drive letter; use the volume of + * the current working directory. */ + volume = NULL; + } else { + /* Path starts with a drive letter (or \\?\ followed by a drive + * letter); use it. */ + volume = alloca((drive_spec_len + 2) * sizeof(wchar_t)); + wmemcpy(volume, path, drive_spec_len); + /* Add trailing backslash in case this was a drive-relative + * path. */ + volume[drive_spec_len] = L'\\'; + volume[drive_spec_len + 1] = L'\0'; + } + bret = GetVolumeInformation( + volume, /* lpRootPathName */ + NULL, /* lpVolumeNameBuffer */ + 0, /* nVolumeNameSize */ + NULL, /* lpVolumeSerialNumber */ + NULL, /* lpMaximumComponentLength */ + &vol_flags, /* lpFileSystemFlags */ + filesystem_name, /* lpFileSystemNameBuffer */ + ARRAY_LEN(filesystem_name)); /* nFileSystemNameSize */ + if (!bret) { + set_errno_from_GetLastError(); + WARNING_WITH_ERRNO("Failed to get volume information for " + "path \"%ls\"", path); + vol_flags = 0xffffffff; + goto out; + } + + if (wcsstr(filesystem_name, L"NTFS")) { + /* FILE_SUPPORTS_HARD_LINKS is only supported on Windows 7 and later. + * Force it on anyway if filesystem is NTFS. */ + vol_flags |= FILE_SUPPORTS_HARD_LINKS; + + if (supports_SetFileShortName_ret) + *supports_SetFileShortName_ret = true; + } + +out: + DEBUG("using vol_flags = %x", vol_flags); + *vol_flags_ret = vol_flags; + return 0; +} + static int win32_start_extract(const wchar_t *path, struct apply_ctx *ctx) { diff --git a/src/win32_common.c b/src/win32_common.c index 8604cfa1..95d41b87 100644 --- a/src/win32_common.c +++ b/src/win32_common.c @@ -302,7 +302,6 @@ win32_error_to_errno(DWORD err_code) } } - void set_errno_from_win32_error(DWORD err) { @@ -321,126 +320,6 @@ set_errno_from_nt_status(NTSTATUS status) set_errno_from_win32_error((*func_RtlNtStatusToDosError)(status)); } -/* Given a Windows-style path, return the number of characters of the prefix - * that specify the path to the root directory of a drive, or return 0 if the - * drive is relative (or at least on the current drive, in the case of - * absolute-but-not-really-absolute paths like \Windows\System32) */ -static size_t -win32_path_drive_spec_len(const wchar_t *path) -{ - size_t n = 0; - - if (!wcsncmp(path, L"\\\\?\\", 4)) { - /* \\?\-prefixed path. Check for following drive letter and - * path separator. */ - if (path[4] != L'\0' && path[5] == L':' && - is_any_path_separator(path[6])) - n = 7; - } else { - /* Not a \\?\-prefixed path. Check for an initial drive letter - * and path separator. */ - if (path[0] != L'\0' && path[1] == L':' && - is_any_path_separator(path[2])) - n = 3; - } - /* Include any additional path separators.*/ - if (n > 0) - while (is_any_path_separator(path[n])) - n++; - return n; -} - -bool -win32_path_is_root_of_drive(const wchar_t *path) -{ - size_t drive_spec_len; - wchar_t full_path[32768]; - DWORD ret; - - ret = GetFullPathName(path, ARRAY_LEN(full_path), full_path, NULL); - if (ret > 0 && ret < ARRAY_LEN(full_path)) - path = full_path; - - /* Explicit drive letter and path separator? */ - drive_spec_len = win32_path_drive_spec_len(path); - if (drive_spec_len > 0 && path[drive_spec_len] == L'\0') - return true; - - /* All path separators? */ - for (const wchar_t *p = path; *p != L'\0'; p++) - if (!is_any_path_separator(*p)) - return false; - return true; -} - - -/* Given a path, which may not yet exist, get a set of flags that describe the - * features of the volume the path is on. */ -int -win32_get_vol_flags(const wchar_t *path, unsigned *vol_flags_ret, - bool *supports_SetFileShortName_ret) -{ - wchar_t *volume; - BOOL bret; - DWORD vol_flags; - size_t drive_spec_len; - wchar_t filesystem_name[MAX_PATH + 1]; - - if (supports_SetFileShortName_ret) - *supports_SetFileShortName_ret = false; - - drive_spec_len = win32_path_drive_spec_len(path); - - if (drive_spec_len == 0) - if (path[0] != L'\0' && path[1] == L':') /* Drive-relative path? */ - drive_spec_len = 2; - - if (drive_spec_len == 0) { - /* Path does not start with a drive letter; use the volume of - * the current working directory. */ - volume = NULL; - } else { - /* Path starts with a drive letter (or \\?\ followed by a drive - * letter); use it. */ - volume = alloca((drive_spec_len + 2) * sizeof(wchar_t)); - wmemcpy(volume, path, drive_spec_len); - /* Add trailing backslash in case this was a drive-relative - * path. */ - volume[drive_spec_len] = L'\\'; - volume[drive_spec_len + 1] = L'\0'; - } - bret = GetVolumeInformation( - volume, /* lpRootPathName */ - NULL, /* lpVolumeNameBuffer */ - 0, /* nVolumeNameSize */ - NULL, /* lpVolumeSerialNumber */ - NULL, /* lpMaximumComponentLength */ - &vol_flags, /* lpFileSystemFlags */ - filesystem_name, /* lpFileSystemNameBuffer */ - ARRAY_LEN(filesystem_name)); /* nFileSystemNameSize */ - if (!bret) { - set_errno_from_GetLastError(); - WARNING_WITH_ERRNO("Failed to get volume information for " - "path \"%ls\"", path); - vol_flags = 0xffffffff; - goto out; - } - - if (wcsstr(filesystem_name, L"NTFS")) { - /* FILE_SUPPORTS_HARD_LINKS is only supported on Windows 7 and later. - * Force it on anyway if filesystem is NTFS. */ - vol_flags |= FILE_SUPPORTS_HARD_LINKS; - - if (supports_SetFileShortName_ret) - *supports_SetFileShortName_ret = true; - } - -out: - DEBUG("using vol_flags = %x", vol_flags); - *vol_flags_ret = vol_flags; - return 0; -} - static bool win32_modify_privilege(const wchar_t *privilege, bool enable) {