#include "lookup_table.h"
#include "security.h"
#include "endianness.h"
+#include <pthread.h>
#include <errno.h>
wchar_t *path,
size_t path_num_chars,
struct wim_lookup_table *lookup_table,
+ struct wim_inode_table *inode_table,
struct sd_set *sd_set,
- const struct capture_config *config,
+ const struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func,
struct win32_capture_state *state);
wchar_t *dir_path,
size_t dir_path_num_chars,
struct wim_lookup_table *lookup_table,
+ struct wim_inode_table *inode_table,
struct sd_set *sd_set,
- const struct capture_config *config,
+ const struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func,
struct win32_capture_state *state)
dir_path,
path_len,
lookup_table,
+ inode_table,
sd_set,
config,
add_image_flags,
wchar_t *path,
size_t path_num_chars,
struct wim_lookup_table *lookup_table,
+ struct wim_inode_table *inode_table,
struct sd_set *sd_set,
- const struct capture_config *config,
+ const struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func,
struct win32_capture_state *state)
u64 file_size;
int ret = 0;
- if (exclude_path(path, config, true)) {
+ if (exclude_path(path, path_num_chars, config, true)) {
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) {
ERROR("Cannot exclude the root directory from capture");
ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
goto out;
}
- if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
+ if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE)
&& progress_func)
{
union wimlib_progress_info info;
goto out_close_handle;
}
- /* Create a WIM dentry */
- ret = new_dentry_with_timeless_inode(path_basename_with_len(path, path_num_chars),
- &root);
+ /* Create a WIM dentry with an associated inode, which may be shared */
+ ret = inode_table_new_dentry(inode_table,
+ path_basename_with_len(path, path_num_chars),
+ ((u64)file_info.nFileIndexHigh << 32) |
+ (u64)file_info.nFileIndexLow,
+ file_info.dwVolumeSerialNumber,
+ &root);
+ if (ret)
+ goto out_close_handle;
+
+ ret = win32_get_short_name(root, path);
if (ret)
goto out_close_handle;
- /* Start preparing the associated WIM inode */
inode = root->d_inode;
+ if (inode->i_nlink > 1) /* Shared inode; nothing more to do */
+ goto out_close_handle;
+
inode->i_attributes = file_info.dwFileAttributes;
inode->i_creation_time = FILETIME_to_u64(&file_info.ftCreationTime);
inode->i_last_write_time = FILETIME_to_u64(&file_info.ftLastWriteTime);
inode->i_last_access_time = FILETIME_to_u64(&file_info.ftLastAccessTime);
- inode->i_ino = ((u64)file_info.nFileIndexHigh << 32) |
- (u64)file_info.nFileIndexLow;
-
inode->i_resolved = 1;
- add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE);
- /* Get DOS name and security descriptor (if any). */
- ret = win32_get_short_name(root, path);
- if (ret)
- goto out_close_handle;
+ add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE);
if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) {
ret = win32_get_security_descriptor(root, sd_set, path, state,
path,
path_num_chars,
lookup_table,
+ inode_table,
sd_set,
config,
add_image_flags,
win32_build_dentry_tree(struct wim_dentry **root_ret,
const wchar_t *root_disk_path,
struct wim_lookup_table *lookup_table,
+ struct wim_inode_table *inode_table,
struct sd_set *sd_set,
- const struct capture_config *config,
+ const struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func,
void *extra_arg)
path,
path_nchars,
lookup_table,
+ inode_table,
sd_set,
config,
add_image_flags,
return -1;
}
+
+/* This really could be replaced with _wcserror_s, but this doesn't seem to
+ * actually be available in MSVCRT.DLL on Windows XP (perhaps it's statically
+ * linked in by Visual Studio...?). */
+extern int
+win32_strerror_r_replacement(int errnum, wchar_t *buf, size_t buflen)
+{
+ static pthread_mutex_t strerror_lock = PTHREAD_MUTEX_INITIALIZER;
+
+ pthread_mutex_lock(&strerror_lock);
+ mbstowcs(buf, strerror(errnum), buflen);
+ buf[buflen - 1] = '\0';
+ pthread_mutex_unlock(&strerror_lock);
+ return 0;
+}
+
#endif /* __WIN32__ */