#ifdef __WIN32__
-#include "win32_common.h"
-#include "wimlib_internal.h"
-#include "lookup_table.h"
-#include "security.h"
-#include "endianness.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "wimlib/win32_common.h"
+
+#include "wimlib/capture.h"
+#include "wimlib/endianness.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/paths.h"
+#include "wimlib/reparse.h"
#define MAX_GET_SD_ACCESS_DENIED_WARNINGS 1
#define MAX_GET_SACL_PRIV_NOTHELD_WARNINGS 1
+#define MAX_CAPTURE_LONG_PATH_WARNINGS 5
+
struct win32_capture_state {
unsigned long num_get_sd_access_denied;
unsigned long num_get_sacl_priv_notheld;
+ unsigned long num_long_path_warnings;
};
}
} else {
size_t len_to_copy = min(len, ctx->bytes_remaining);
- memcpy(ctx->read_prefix_ctx_or_buf, data, len_to_copy);
+ ctx->read_prefix_ctx_or_buf = mempcpy(ctx->read_prefix_ctx_or_buf,
+ data,
+ len_to_copy);
ctx->bytes_remaining -= len_to_copy;
- ctx->read_prefix_ctx_or_buf += len_to_copy;
}
return ERROR_SUCCESS;
}
static int
win32_get_security_descriptor(struct wim_dentry *dentry,
- struct sd_set *sd_set,
+ struct wim_sd_set *sd_set,
const wchar_t *path,
struct win32_capture_state *state,
int add_flags)
* opendir(), FindFirstFileW has file globbing built into it. But this
* isn't what we actually want, so just add a dummy glob to get all
* entries. */
- dir_path[dir_path_num_chars] = L'/';
+ dir_path[dir_path_num_chars] = OS_PREFERRED_PATH_SEPARATOR;
dir_path[dir_path_num_chars + 1] = L'*';
dir_path[dir_path_num_chars + 2] = L'\0';
hFind = FindFirstFileW(dir_path, &dat);
continue;
size_t filename_len = wcslen(dat.cFileName);
- dir_path[dir_path_num_chars] = L'/';
+ dir_path[dir_path_num_chars] = OS_PREFERRED_PATH_SEPARATOR;
wmemcpy(dir_path + dir_path_num_chars + 1,
dat.cFileName,
filename_len + 1);
return ret;
}
-int
-win32_get_file_and_vol_ids(const wchar_t *path, u64 *ino_ret, u64 *dev_ret)
-{
- HANDLE hFile;
- DWORD err;
- BY_HANDLE_FILE_INFORMATION file_info;
- int ret;
-
- hFile = win32_open_existing_file(path, FILE_READ_ATTRIBUTES);
- if (hFile == INVALID_HANDLE_VALUE) {
- err = GetLastError();
- if (err != ERROR_FILE_NOT_FOUND) {
- WARNING("Failed to open \"%ls\" to get file "
- "and volume IDs", path);
- win32_error(err);
- }
- return WIMLIB_ERR_OPEN;
- }
-
- if (!GetFileInformationByHandle(hFile, &file_info)) {
- err = GetLastError();
- ERROR("Failed to get file information for \"%ls\"", path);
- win32_error(err);
- ret = WIMLIB_ERR_STAT;
- } else {
- *ino_ret = ((u64)file_info.nFileIndexHigh << 32) |
- (u64)file_info.nFileIndexLow;
- *dev_ret = file_info.dwVolumeSerialNumber;
- ret = 0;
- }
- CloseHandle(hFile);
- return ret;
-}
-
/* Reparse point fixup status code */
enum rp_status {
/* Reparse point corresponded to an absolute symbolic link or junction
const wchar_t *path)
{
struct reparse_data rpdata;
- DWORD rpbuflen;
int ret;
enum rp_status rp_status;
- rpbuflen = *rpbuflen_p;
- ret = parse_reparse_data(rpbuf, rpbuflen, &rpdata);
+ ret = parse_reparse_data(rpbuf, *rpbuflen_p, &rpdata);
if (ret)
return -ret;
&rpdata.substitute_name_nbytes,
capture_root_ino,
capture_root_dev,
- le32_to_cpu(*(u32*)rpbuf));
+ le32_to_cpu(*(le32*)rpbuf));
if (rp_status & RP_FIXED) {
wimlib_assert(rpdata.substitute_name_nbytes % 2 == 0);
utf16lechar substitute_name_copy[rpdata.substitute_name_nbytes / 2];
rpdata.print_name += 4;
rpdata.print_name_nbytes -= 8;
}
- ret = make_reparse_buffer(&rpdata, rpbuf);
+ ret = make_reparse_buffer(&rpdata, rpbuf, rpbuflen_p);
if (ret == 0)
ret = rp_status;
else
}
rpbuflen = bytesReturned;
- reparse_tag = le32_to_cpu(*(u32*)rpbuf);
+ reparse_tag = le32_to_cpu(*(le32*)rpbuf);
if (params->add_flags & WIMLIB_ADD_FLAG_RPFIX &&
(reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK ||
reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT))
if (is_named_stream) {
spath_nchars += 1 + stream_name_nchars;
colonchar = L":";
- if (path_num_chars == 1 &&
- path[0] != L'/' &&
- path[0] != L'\\')
- {
+ if (path_num_chars == 1 && !is_any_path_separator(path[0])) {
spath_nchars += 2;
- relpath_prefix = L"./";
+ static const wchar_t _relpath_prefix[] =
+ {L'.', OS_PREFERRED_PATH_SEPARATOR, L'\0'};
+ relpath_prefix = _relpath_prefix;
}
}
goto out;
}
+#if 0
+ if (path_num_chars >= 4 &&
+ !wmemcmp(path, L"\\\\?\\", 4) &&
+ path_num_chars + 1 - 4 > MAX_PATH &&
+ state->num_long_path_warnings < MAX_CAPTURE_LONG_PATH_WARNINGS)
+ {
+ WARNING("Path \"%ls\" exceeds MAX_PATH", path);
+ if (++state->num_long_path_warnings == MAX_CAPTURE_LONG_PATH_WARNINGS)
+ WARNING("Suppressing further warnings about long paths.");
+ }
+#endif
+
if ((params->add_flags & WIMLIB_ADD_FLAG_VERBOSE)
&& params->progress_func)
{
/* Reparse point: set the reparse data (which we read already)
* */
inode->i_not_rpfixed = not_rpfixed;
- inode->i_reparse_tag = le32_to_cpu(*(u32*)rpbuf);
+ inode->i_reparse_tag = le32_to_cpu(*(le32*)rpbuf);
ret = inode_set_unnamed_stream(inode, rpbuf + 8, rpbuflen - 8,
params->lookup_table);
} else if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
" descriptors.\n");
}
+#define WINDOWS_NT_MAX_PATH 32768
+
/* Win32 version of capturing a directory tree */
int
win32_build_dentry_tree(struct wim_dentry **root_ret,
int ret;
struct win32_capture_state state;
unsigned vol_flags;
+ DWORD dret;
if (!win32func_FindFirstStreamW) {
WARNING("Running on Windows XP or earlier; "
}
path_nchars = wcslen(root_disk_path);
- if (path_nchars > 32767)
+ if (path_nchars > WINDOWS_NT_MAX_PATH)
return WIMLIB_ERR_INVALID_PARAM;
if (GetFileAttributesW(root_disk_path) == INVALID_FILE_ATTRIBUTES &&
win32_get_vol_flags(root_disk_path, &vol_flags);
- /* There is no check for overflow later when this buffer is being used!
- * But the max path length on NTFS is 32767 characters, and paths need
- * to be written specially to even go past 260 characters, so we should
- * be okay with 32770 characters. */
- path = MALLOC(32770 * sizeof(wchar_t));
+ /* WARNING: There is no check for overflow later when this buffer is
+ * being used! But it's as long as the maximum path length understood
+ * by Windows NT (which is NOT the same as MAX_PATH). */
+ path = MALLOC(WINDOWS_NT_MAX_PATH * sizeof(wchar_t));
if (!path)
return WIMLIB_ERR_NOMEM;
- wmemcpy(path, root_disk_path, path_nchars + 1);
+ /* Work around defective behavior in Windows where paths longer than 260
+ * characters are not supported by default; instead they need to be
+ * turned into absolute paths and prefixed with "\\?\". */
+
+ if (wcsncmp(root_disk_path, L"\\\\?\\", 4)) {
+ dret = GetFullPathName(root_disk_path, WINDOWS_NT_MAX_PATH - 4,
+ &path[4], NULL);
+
+ if (dret == 0 || dret >= WINDOWS_NT_MAX_PATH - 4) {
+ WARNING("Can't get full path name for \"%ls\"", root_disk_path);
+ wmemcpy(path, root_disk_path, path_nchars + 1);
+ } else {
+ wmemcpy(path, L"\\\\?\\", 4);
+ path_nchars = 4 + dret;
+ }
+ } else {
+ wmemcpy(path, root_disk_path, path_nchars + 1);
+ }
memset(&state, 0, sizeof(state));
ret = win32_build_dentry_tree_recursive(root_ret, path,
git://wimlib.net / wimlib / blobdiff