#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
}
} 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)
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))
* only 1 link and refuse to hard link them. This is because Windows
* has a bug where it can return duplicate File IDs for files and
* directories on the FAT filesystem. */
- ret = inode_table_new_dentry(params->inode_table,
+ ret = inode_table_new_dentry(¶ms->inode_table,
path_basename_with_len(path, path_num_chars),
((u64)file_info.nFileIndexHigh << 32) |
(u64)file_info.nFileIndexLow,
if (!(params->add_flags & WIMLIB_ADD_FLAG_NO_ACLS)
&& (vol_flags & FILE_PERSISTENT_ACLS))
{
- ret = win32_get_security_descriptor(root, params->sd_set,
+ ret = win32_get_security_descriptor(root, ¶ms->sd_set,
path, state,
params->add_flags);
if (ret)
/* 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) {