*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
+#include "config.h"
+
+#if defined(__CYGWIN__) || defined(__WIN32__)
+# include <windows.h>
+# include <ntdef.h>
+# include <wchar.h>
+# ifdef ERROR
+# undef ERROR
+# endif
+# include "security.h"
+#else
+# include <dirent.h>
+# include <sys/stat.h>
+# include "timestamp.h"
+#endif
+
#include "wimlib_internal.h"
#include "dentry.h"
-#include "timestamp.h"
#include "lookup_table.h"
#include "xml.h"
-#include <string.h>
-#include <fnmatch.h>
#include <ctype.h>
-#include <sys/stat.h>
-#include <dirent.h>
#include <errno.h>
+#include <fnmatch.h>
+#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-/** Private flag: Used to mark that we currently adding the root directory of
- * the WIM image. */
-#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
+#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000
+#define WIMLIB_ADD_IMAGE_FLAG_SOURCE 0x40000000
/*
- * Adds an image (given by its dentry tree) to the image metadata array of a WIM
- * file, adds an entry to the lookup table for the image metadata, updates the
- * image count in the header, and selects the new image.
- *
- * Does not update the XML data.
- *
- * On failure, WIMLIB_ERR_NOMEM is returned and no changes are made. Otherwise,
- * 0 is returned and the image metadata array of @w is modified.
- *
- * @w: The WIMStruct for the WIM file.
- * @root_dentry: The root of the directory tree for the image.
- * @sd: The security data for the image.
+ * Adds the dentry tree and security data for a new image to the image metadata
+ * array of the WIMStruct.
*/
-int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry,
+int add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry,
struct wim_security_data *sd)
{
- struct lookup_table_entry *metadata_lte;
- struct image_metadata *imd;
- struct image_metadata *new_imd;
+ struct wim_lookup_table_entry *metadata_lte;
+ struct wim_image_metadata *imd;
+ struct wim_image_metadata *new_imd;
wimlib_assert(root_dentry != NULL);
DEBUG("Reallocating image metadata array for image_count = %u",
w->hdr.image_count + 1);
- imd = CALLOC((w->hdr.image_count + 1), sizeof(struct image_metadata));
+ imd = CALLOC((w->hdr.image_count + 1), sizeof(struct wim_image_metadata));
if (!imd) {
ERROR("Failed to allocate memory for new image metadata array");
}
memcpy(imd, w->image_metadata,
- w->hdr.image_count * sizeof(struct image_metadata));
+ w->hdr.image_count * sizeof(struct wim_image_metadata));
metadata_lte = new_lookup_table_entry();
if (!metadata_lte)
}
+#if defined(__CYGWIN__) || defined(__WIN32__)
+
+static u64 FILETIME_to_u64(const FILETIME *ft)
+{
+ return ((u64)ft->dwHighDateTime << 32) | (u64)ft->dwLowDateTime;
+}
+
+
+static int build_dentry_tree(struct wim_dentry **root_ret,
+ const char *root_disk_path,
+ struct wim_lookup_table *lookup_table,
+ struct wim_security_data *sd,
+ const struct capture_config *config,
+ int add_image_flags,
+ wimlib_progress_func_t progress_func,
+ void *extra_arg);
+
+static int win32_get_short_name(struct wim_dentry *dentry,
+ const wchar_t *path_utf16)
+{
+ WIN32_FIND_DATAW dat;
+ if (FindFirstFileW(path_utf16, &dat) &&
+ dat.cAlternateFileName[0] != L'\0')
+ {
+ size_t short_name_len = wcslen(dat.cAlternateFileName) * 2;
+ size_t n = short_name_len + sizeof(wchar_t);
+ dentry->short_name = MALLOC(n);
+ if (!dentry->short_name)
+ return WIMLIB_ERR_NOMEM;
+ memcpy(dentry->short_name, dat.cAlternateFileName, n);
+ dentry->short_name_len = short_name_len;
+ }
+ return 0;
+}
+
+static int win32_get_security_descriptor(struct wim_dentry *dentry,
+ struct sd_set *sd_set,
+ const wchar_t *path_utf16)
+{
+ SECURITY_INFORMATION requestedInformation;
+ DWORD lenNeeded = 0;
+ BOOL status;
+ DWORD err;
+
+ requestedInformation = DACL_SECURITY_INFORMATION |
+ SACL_SECURITY_INFORMATION |
+ OWNER_SECURITY_INFORMATION |
+ GROUP_SECURITY_INFORMATION;
+ /* Request length of security descriptor */
+ status = GetFileSecurityW(path_utf16, requestedInformation,
+ NULL, 0, &lenNeeded);
+ err = GetLastError();
+ if (!status && err == ERROR_INSUFFICIENT_BUFFER) {
+ DWORD len = lenNeeded;
+ char buf[len];
+ if (GetFileSecurityW(path_utf16, requestedInformation,
+ buf, len, &lenNeeded))
+ {
+ int security_id = sd_set_add_sd(sd_set, buf, len);
+ if (security_id < 0)
+ return WIMLIB_ERR_NOMEM;
+ else {
+ dentry->d_inode->i_security_id = security_id;
+ return 0;
+ }
+ } else {
+ err = GetLastError();
+ }
+ }
+ ERROR("Win32 API: Failed to read security descriptor of \"%ls\"",
+ path_utf16);
+ win32_error(err);
+ return WIMLIB_ERR_READ;
+}
+
+/* Reads the directory entries of directory using a Win32 API and recursively
+ * calls build_dentry_tree() on them. */
+static int win32_recurse_directory(struct wim_dentry *root,
+ const char *root_disk_path,
+ struct wim_lookup_table *lookup_table,
+ struct wim_security_data *sd,
+ const struct capture_config *config,
+ int add_image_flags,
+ wimlib_progress_func_t progress_func,
+ struct sd_set *sd_set,
+ const wchar_t *path_utf16,
+ size_t path_utf16_nchars)
+{
+ WIN32_FIND_DATAW dat;
+ HANDLE hFind;
+ DWORD err;
+ int ret;
+
+ {
+ /* Begin reading the directory by calling FindFirstFileW.
+ * Unlike UNIX 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. */
+ wchar_t pattern_buf[path_utf16_nchars + 3];
+ memcpy(pattern_buf, path_utf16,
+ path_utf16_nchars * sizeof(wchar_t));
+ pattern_buf[path_utf16_nchars] = L'/';
+ pattern_buf[path_utf16_nchars + 1] = L'*';
+ pattern_buf[path_utf16_nchars + 2] = L'\0';
+ hFind = FindFirstFileW(pattern_buf, &dat);
+ }
+ if (hFind == INVALID_HANDLE_VALUE) {
+ err = GetLastError();
+ if (err == ERROR_FILE_NOT_FOUND) {
+ return 0;
+ } else {
+ ERROR("Win32 API: Failed to read directory \"%s\"",
+ root_disk_path);
+ win32_error(err);
+ return WIMLIB_ERR_READ;
+ }
+ }
+ ret = 0;
+ do {
+ /* Skip . and .. entries */
+ if (!(dat.cFileName[0] == L'.' &&
+ (dat.cFileName[1] == L'\0' ||
+ (dat.cFileName[1] == L'.' && dat.cFileName[2] == L'\0'))))
+ {
+ struct wim_dentry *child;
+
+ char *utf8_name;
+ size_t utf8_name_nbytes;
+ ret = utf16_to_utf8((const char*)dat.cFileName,
+ wcslen(dat.cFileName) * sizeof(wchar_t),
+ &utf8_name,
+ &utf8_name_nbytes);
+ if (ret)
+ goto out_find_close;
+
+ char name[strlen(root_disk_path) + 1 + utf8_name_nbytes + 1];
+ sprintf(name, "%s/%s", root_disk_path, utf8_name);
+ FREE(utf8_name);
+ ret = build_dentry_tree(&child, name, lookup_table,
+ sd, config, add_image_flags,
+ progress_func, sd_set);
+ if (ret)
+ goto out_find_close;
+ if (child)
+ dentry_add_child(root, child);
+ }
+ } while (FindNextFileW(hFind, &dat));
+ err = GetLastError();
+ if (err != ERROR_NO_MORE_FILES) {
+ ERROR("Win32 API: Failed to read directory \"%s\"", root_disk_path);
+ win32_error(err);
+ if (ret == 0)
+ ret = WIMLIB_ERR_READ;
+ }
+out_find_close:
+ FindClose(hFind);
+ return ret;
+}
+
+/* Load a reparse point into a WIM inode. It is just stored in memory.
+ *
+ * @hFile: Open handle to a reparse point, with permission to read the reparse
+ * data.
+ *
+ * @inode: WIM inode for the reparse point.
+ *
+ * @lookup_table: Stream lookup table for the WIM; an entry will be added to it
+ * for the reparse point unless an entry already exists for
+ * the exact same data stream.
+ *
+ * @path: External path to the parse point (UTF-8). Used for error messages
+ * only.
+ *
+ * Returns 0 on success; nonzero on failure. */
+static int win32_capture_reparse_point(HANDLE hFile,
+ struct wim_inode *inode,
+ struct wim_lookup_table *lookup_table,
+ const char *path)
+{
+ /* "Reparse point data, including the tag and optional GUID,
+ * cannot exceed 16 kilobytes." - MSDN */
+ char reparse_point_buf[16 * 1024];
+ DWORD bytesReturned;
+
+ if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT,
+ NULL, 0, reparse_point_buf,
+ sizeof(reparse_point_buf), &bytesReturned, NULL))
+ {
+ DWORD err = GetLastError();
+ ERROR("Win32 API: Failed to get reparse data of \"%s\"", path);
+ win32_error(err);
+ return WIMLIB_ERR_READ;
+ }
+ if (bytesReturned < 8) {
+ ERROR("Reparse data on \"%s\" is invalid", path);
+ return WIMLIB_ERR_READ;
+ }
+ inode->i_reparse_tag = *(u32*)reparse_point_buf;
+ return inode_add_ads_with_data(inode, "",
+ (const u8*)reparse_point_buf + 8,
+ bytesReturned - 8, lookup_table);
+}
+
+/* Calculate the SHA1 message digest of a Win32 data stream, which may be either
+ * an unnamed or named data stream.
+ *
+ * @path: Path to the file, with the stream noted at the end for named
+ * streams. UTF-16LE encoding.
+ *
+ * @hash: On success, the SHA1 message digest of the stream is written to
+ * this location.
+ *
+ * Returns 0 on success; nonzero on failure.
+ */
+static int win32_sha1sum(const wchar_t *path, u8 hash[SHA1_HASH_SIZE])
+{
+ HANDLE hFile;
+ SHA_CTX ctx;
+ u8 buf[32768];
+ DWORD bytesRead;
+ int ret;
+
+ hFile = win32_open_file_readonly(path);
+ if (hFile == INVALID_HANDLE_VALUE)
+ return WIMLIB_ERR_OPEN;
+
+ sha1_init(&ctx);
+ for (;;) {
+ if (!ReadFile(hFile, buf, sizeof(buf), &bytesRead, NULL)) {
+ ret = WIMLIB_ERR_READ;
+ goto out_close_handle;
+ }
+ if (bytesRead == 0)
+ break;
+ sha1_update(&ctx, buf, bytesRead);
+ }
+ ret = 0;
+ sha1_final(hash, &ctx);
+out_close_handle:
+ CloseHandle(hFile);
+ return ret;
+}
+
+/* Scans an unnamed or named stream of a Win32 file (not a reparse point
+ * stream); calculates its SHA1 message digest and either creates a `struct
+ * wim_lookup_table_entry' in memory for it, or uses an existing 'struct
+ * wim_lookup_table_entry' for an identical stream.
+ *
+ * @path_utf16: Path to the file (UTF-16LE).
+ *
+ * @path_utf16_nchars: Number of 2-byte characters in @path_utf16.
+ *
+ * @inode: WIM inode to save the stream into.
+ *
+ * @lookup_table: Stream lookup table for the WIM.
+ *
+ * @dat: A `WIN32_FIND_STREAM_DATA' structure that specifies the
+ * stream name.
+ *
+ * Returns 0 on success; nonzero on failure.
+ */
+static int win32_capture_stream(const wchar_t *path_utf16,
+ size_t path_utf16_nchars,
+ struct wim_inode *inode,
+ struct wim_lookup_table *lookup_table,
+ WIN32_FIND_STREAM_DATA *dat)
+{
+ struct wim_ads_entry *ads_entry;
+ u8 hash[SHA1_HASH_SIZE];
+ struct wim_lookup_table_entry *lte;
+ int ret;
+ wchar_t *p, *colon;
+ bool is_named_stream;
+ wchar_t *spath;
+ size_t spath_nchars;
+ DWORD err;
+
+ /* The stream name should be returned as :NAME:TYPE */
+ p = dat->cStreamName;
+ if (*p != L':')
+ goto out_invalid_stream_name;
+ p += 1;
+ colon = wcschr(p, L':');
+ if (colon == NULL)
+ goto out_invalid_stream_name;
+
+ if (wcscmp(colon + 1, L"$DATA")) {
+ /* Not a DATA stream */
+ ret = 0;
+ goto out;
+ }
+
+ is_named_stream = (p != colon);
+ if (is_named_stream) {
+ /* Allocate an ADS entry for the named stream. */
+ char *utf8_stream_name;
+ size_t utf8_stream_name_len;
+ ret = utf16_to_utf8((const char *)p,
+ (colon - p) * sizeof(wchar_t),
+ &utf8_stream_name,
+ &utf8_stream_name_len);
+ if (ret)
+ goto out;
+ ads_entry = inode_add_ads(inode, utf8_stream_name);
+ FREE(utf8_stream_name);
+ if (!ads_entry) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out;
+ }
+ }
+
+ /* Create a UTF-16 string @spath that gives the filename, then a colon,
+ * then the stream name. Or, if it's an unnamed stream, just the
+ * filename. It is MALLOC()'ed so that it can be saved in the
+ * wim_lookup_table_entry if needed. */
+ *colon = '\0';
+ spath_nchars = path_utf16_nchars;
+ if (is_named_stream)
+ spath_nchars += colon - p + 1;
+
+ spath = MALLOC((spath_nchars + 1) * sizeof(wchar_t));
+ memcpy(spath, path_utf16, path_utf16_nchars * sizeof(wchar_t));
+ if (is_named_stream) {
+ spath[path_utf16_nchars] = L':';
+ memcpy(&spath[path_utf16_nchars + 1], p, (colon - p) * sizeof(wchar_t));
+ }
+ spath[spath_nchars] = L'\0';
+
+ ret = win32_sha1sum(spath, hash);
+ if (ret) {
+ err = GetLastError();
+ ERROR("Win32 API: Failed to read \"%ls\" to calculate SHA1sum",
+ path_utf16);
+ win32_error(err);
+ goto out_free_spath;
+ }
+
+ lte = __lookup_resource(lookup_table, hash);
+ if (lte) {
+ /* Use existing wim_lookup_table_entry that has the same SHA1
+ * message digest */
+ lte->refcnt++;
+ } else {
+ /* Make a new wim_lookup_table_entry */
+ lte = new_lookup_table_entry();
+ if (!lte) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_free_spath;
+ }
+ lte->file_on_disk = (char*)spath;
+ spath = NULL;
+ lte->resource_location = RESOURCE_WIN32;
+ lte->resource_entry.original_size = (uint64_t)dat->StreamSize.QuadPart;
+ lte->resource_entry.size = (uint64_t)dat->StreamSize.QuadPart;
+ copy_hash(lte->hash, hash);
+ lookup_table_insert(lookup_table, lte);
+ }
+ if (is_named_stream)
+ ads_entry->lte = lte;
+ else
+ inode->i_lte = lte;
+out_free_spath:
+ FREE(spath);
+out:
+ return ret;
+out_invalid_stream_name:
+ ERROR("Invalid stream name: \"%ls:%ls\"", path_utf16, dat->cStreamName);
+ ret = WIMLIB_ERR_READ;
+ goto out;
+}
+
+/* Scans a Win32 file for unnamed and named data streams (not reparse point
+ * streams).
+ *
+ * @path_utf16: Path to the file (UTF-16LE).
+ *
+ * @path_utf16_nchars: Number of 2-byte characters in @path_utf16.
+ *
+ * @inode: WIM inode to save the stream into.
+ *
+ * @lookup_table: Stream lookup table for the WIM.
+ *
+ * Returns 0 on success; nonzero on failure.
+ */
+static int win32_capture_streams(const wchar_t *path_utf16,
+ size_t path_utf16_nchars,
+ struct wim_inode *inode,
+ struct wim_lookup_table *lookup_table)
+{
+ WIN32_FIND_STREAM_DATA dat;
+ int ret;
+ HANDLE hFind;
+ DWORD err;
+
+ hFind = FindFirstStreamW(path_utf16, FindStreamInfoStandard, &dat, 0);
+ if (hFind == INVALID_HANDLE_VALUE) {
+ err = GetLastError();
+
+ /* Seems legal for this to return ERROR_HANDLE_EOF on reparse
+ * points and directories */
+ if ((inode->i_attributes &
+ (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
+ && err == ERROR_HANDLE_EOF)
+ {
+ return 0;
+ } else {
+ ERROR("Win32 API: Failed to look up data streams of \"%ls\"",
+ path_utf16);
+ win32_error(err);
+ return WIMLIB_ERR_READ;
+ }
+ }
+ do {
+ ret = win32_capture_stream(path_utf16,
+ path_utf16_nchars,
+ inode, lookup_table,
+ &dat);
+ if (ret)
+ goto out_find_close;
+ } while (FindNextStreamW(hFind, &dat));
+ err = GetLastError();
+ if (err != ERROR_HANDLE_EOF) {
+ ERROR("Win32 API: Error reading data streams from \"%ls\"", path_utf16);
+ win32_error(err);
+ ret = WIMLIB_ERR_READ;
+ }
+out_find_close:
+ FindClose(hFind);
+ return ret;
+}
+
+#endif
/*
- * Recursively builds a dentry tree from a directory tree on disk, outside the
- * WIM file.
+ * build_dentry_tree():
+ * Recursively builds a tree of WIM dentries from an on-disk directory
+ * tree.
*
* @root_ret: Place to return a pointer to the root of the dentry tree. Only
- * modified if successful. NULL if the file or directory was
+ * modified if successful. Set to NULL if the file or directory was
* excluded from capture.
*
- * @root_disk_path: The path to the root of the directory tree on disk.
+ * @root_disk_path: The path to the root of the directory tree on disk (UTF-8).
*
* @lookup_table: The lookup table for the WIM file. For each file added to the
* dentry tree being built, an entry is added to the lookup table,
*
* @add_flags: Bitwise or of WIMLIB_ADD_IMAGE_FLAG_*
*
- * @extra_arg: Ignored. (Only used in NTFS mode.)
+ * @extra_arg: Ignored in UNIX builds; used to pass sd_set pointer in Windows
+ * builds.
*
* @return: 0 on success, nonzero on failure. It is a failure if any of
* the files cannot be `stat'ed, or if any of the needed
* the on-disk files during a call to wimlib_write() or
* wimlib_overwrite().
*/
-static int build_dentry_tree(struct dentry **root_ret,
+static int build_dentry_tree(struct wim_dentry **root_ret,
const char *root_disk_path,
- struct lookup_table *lookup_table,
+ struct wim_lookup_table *lookup_table,
struct wim_security_data *sd,
const struct capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func,
void *extra_arg)
{
- struct stat root_stbuf;
+ struct wim_dentry *root = NULL;
int ret = 0;
- int (*stat_fn)(const char *restrict, struct stat *restrict);
- struct dentry *root;
- const char *filename;
- struct inode *inode;
+ struct wim_inode *inode;
if (exclude_path(root_disk_path, config, true)) {
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) {
ERROR("Cannot exclude the root directory from capture");
- return WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
+ ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
+ goto out;
}
if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
&& progress_func)
info.scan.excluded = true;
progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
}
- *root_ret = NULL;
- return 0;
+ goto out;
}
if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
}
+#if !defined(__CYGWIN__) && !defined(__WIN32__)
+ /* UNIX version of capturing a directory tree */
+ struct stat root_stbuf;
+ int (*stat_fn)(const char *restrict, struct stat *restrict);
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE)
stat_fn = stat;
else
ret = (*stat_fn)(root_disk_path, &root_stbuf);
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path);
- return WIMLIB_ERR_STAT;
+ goto out;
}
if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) &&
ret = stat(root_disk_path, &root_stbuf);
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path);
- return WIMLIB_ERR_STAT;
+ ret = WIMLIB_ERR_STAT;
+ goto out;
}
if (!S_ISDIR(root_stbuf.st_mode)) {
ERROR("`%s' is not a directory", root_disk_path);
- return WIMLIB_ERR_NOTDIR;
+ ret = WIMLIB_ERR_NOTDIR;
+ goto out;
}
}
if (!S_ISREG(root_stbuf.st_mode) && !S_ISDIR(root_stbuf.st_mode)
&& !S_ISLNK(root_stbuf.st_mode)) {
ERROR("`%s' is not a regular file, directory, or symbolic link.",
root_disk_path);
- return WIMLIB_ERR_SPECIAL_FILE;
+ ret = WIMLIB_ERR_SPECIAL_FILE;
+ goto out;
}
- if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT)
- filename = "";
- else
- filename = path_basename(root_disk_path);
-
- root = new_dentry_with_timeless_inode(filename);
- if (!root)
- return WIMLIB_ERR_NOMEM;
+ root = new_dentry_with_timeless_inode(path_basename(root_disk_path));
+ if (!root) {
+ if (errno == EILSEQ)
+ ret = WIMLIB_ERR_INVALID_UTF8_STRING;
+ else if (errno == ENOMEM)
+ ret = WIMLIB_ERR_NOMEM;
+ else
+ ret = WIMLIB_ERR_ICONV_NOT_AVAILABLE;
+ goto out;
+ }
inode = root->d_inode;
#ifdef HAVE_STAT_NANOSECOND_PRECISION
- inode->creation_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim);
- inode->last_write_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim);
- inode->last_access_time = timespec_to_wim_timestamp(&root_stbuf.st_atim);
+ inode->i_creation_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim);
+ inode->i_last_write_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim);
+ inode->i_last_access_time = timespec_to_wim_timestamp(&root_stbuf.st_atim);
#else
- inode->creation_time = unix_timestamp_to_wim(root_stbuf.st_mtime);
- inode->last_write_time = unix_timestamp_to_wim(root_stbuf.st_mtime);
- inode->last_access_time = unix_timestamp_to_wim(root_stbuf.st_atime);
+ inode->i_creation_time = unix_timestamp_to_wim(root_stbuf.st_mtime);
+ inode->i_last_write_time = unix_timestamp_to_wim(root_stbuf.st_mtime);
+ inode->i_last_access_time = unix_timestamp_to_wim(root_stbuf.st_atime);
#endif
if (sizeof(ino_t) >= 8)
- inode->ino = (u64)root_stbuf.st_ino;
+ inode->i_ino = (u64)root_stbuf.st_ino;
else
- inode->ino = (u64)root_stbuf.st_ino |
+ inode->i_ino = (u64)root_stbuf.st_ino |
((u64)root_stbuf.st_dev << ((sizeof(ino_t) * 8) & 63));
-
- add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT;
- inode->resolved = 1;
-
+ inode->i_resolved = 1;
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
+ ret = inode_set_unix_data(inode, root_stbuf.st_uid,
+ root_stbuf.st_gid,
+ root_stbuf.st_mode,
+ lookup_table,
+ UNIX_DATA_ALL | UNIX_DATA_CREATE);
+ if (ret)
+ goto out;
+ }
+ add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE);
if (S_ISREG(root_stbuf.st_mode)) { /* Archiving a regular file */
- struct lookup_table_entry *lte;
+ struct wim_lookup_table_entry *lte;
u8 hash[SHA1_HASH_SIZE];
- inode->attributes = FILE_ATTRIBUTE_NORMAL;
+ inode->i_attributes = FILE_ATTRIBUTE_NORMAL;
/* Empty files do not have to have a lookup table entry. */
if (root_stbuf.st_size == 0)
copy_hash(lte->hash, hash);
lookup_table_insert(lookup_table, lte);
}
- root->d_inode->lte = lte;
+ root->d_inode->i_lte = lte;
} else if (S_ISDIR(root_stbuf.st_mode)) { /* Archiving a directory */
- inode->attributes = FILE_ATTRIBUTE_DIRECTORY;
+ inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
DIR *dir;
struct dirent entry, *result;
- struct dentry *child;
+ struct wim_dentry *child;
dir = opendir(root_disk_path);
if (!dir) {
}
closedir(dir);
} else { /* Archiving a symbolic link */
- inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
- inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
+ inode->i_attributes = FILE_ATTRIBUTE_REPARSE_POINT;
+ inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
/* The idea here is to call readlink() to get the UNIX target of
* the symbolic link, then turn the target into a reparse point
if (stat(root_disk_path, &stbuf) == 0 &&
S_ISDIR(stbuf.st_mode))
{
- inode->attributes |= FILE_ATTRIBUTE_DIRECTORY;
+ inode->i_attributes |= FILE_ATTRIBUTE_DIRECTORY;
}
}
} else {
ret = WIMLIB_ERR_READLINK;
}
}
+#else
+ /* Win32 version of capturing a directory tree */
+
+ wchar_t *path_utf16;
+ size_t path_utf16_nchars;
+ struct sd_set *sd_set;
+ DWORD err;
+
+ if (extra_arg == NULL) {
+ sd_set = alloca(sizeof(struct sd_set));
+ sd_set->rb_root.rb_node = NULL,
+ sd_set->sd = sd;
+ } else {
+ sd_set = extra_arg;
+ }
+
+ ret = utf8_to_utf16(root_disk_path, strlen(root_disk_path),
+ (char**)&path_utf16, &path_utf16_nchars);
+ if (ret)
+ goto out_destroy_sd_set;
+ path_utf16_nchars /= sizeof(wchar_t);
+
+ HANDLE hFile = win32_open_file_readonly(path_utf16);
+ if (hFile == INVALID_HANDLE_VALUE) {
+ err = GetLastError();
+ ERROR("Win32 API: Failed to open \"%s\"", root_disk_path);
+ win32_error(err);
+ ret = WIMLIB_ERR_OPEN;
+ goto out_free_path_utf16;
+ }
+
+ BY_HANDLE_FILE_INFORMATION file_info;
+ if (!GetFileInformationByHandle(hFile, &file_info)) {
+ err = GetLastError();
+ ERROR("Win32 API: Failed to get file information for \"%s\"",
+ root_disk_path);
+ win32_error(err);
+ ret = WIMLIB_ERR_STAT;
+ goto out_close_handle;
+ }
+
+ /* Create a WIM dentry */
+ root = new_dentry_with_timeless_inode(path_basename(root_disk_path));
+ if (!root) {
+ if (errno == EILSEQ)
+ ret = WIMLIB_ERR_INVALID_UTF8_STRING;
+ else if (errno == ENOMEM)
+ ret = WIMLIB_ERR_NOMEM;
+ else
+ ret = WIMLIB_ERR_ICONV_NOT_AVAILABLE;
+ goto out_close_handle;
+ }
+
+ /* Start preparing the associated WIM inode */
+ inode = root->d_inode;
+
+ 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_utf16);
+ if (ret)
+ goto out_close_handle;
+ ret = win32_get_security_descriptor(root, sd_set, path_utf16);
+ if (ret)
+ goto out_close_handle;
+
+ if (inode_is_directory(inode)) {
+ /* Directory (not a reparse point) --- recurse to children */
+
+ /* But first... directories may have alternate data streams that
+ * need to be captured. */
+ ret = win32_capture_streams(path_utf16,
+ path_utf16_nchars,
+ inode,
+ lookup_table);
+ if (ret)
+ goto out_close_handle;
+ ret = win32_recurse_directory(root,
+ root_disk_path,
+ lookup_table,
+ sd,
+ config,
+ add_image_flags,
+ progress_func,
+ sd_set,
+ path_utf16,
+ path_utf16_nchars);
+ } else if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+ /* Reparse point: save the reparse tag and data */
+ ret = win32_capture_reparse_point(hFile,
+ inode,
+ lookup_table,
+ root_disk_path);
+ } else {
+ /* Not a directory, not a reparse point; capture the default
+ * file contents and any alternate data streams. */
+ ret = win32_capture_streams(path_utf16,
+ path_utf16_nchars,
+ inode,
+ lookup_table);
+ }
+out_close_handle:
+ CloseHandle(hFile);
+out_free_path_utf16:
+ FREE(path_utf16);
+out_destroy_sd_set:
+ if (extra_arg == NULL)
+ destroy_sd_set(sd_set);
+#endif
+ /* The below lines of code are common to both UNIX and Win32 builds. It
+ * simply returns the captured directory tree if the capture was
+ * successful, or frees it if the capture was unsuccessful. */
out:
if (ret == 0)
*root_ret = root;
return ret;
}
-
enum pattern_type {
NONE = 0,
EXCLUSION_LIST,
ALIGNMENT_LIST,
};
+#define COMPAT_DEFAULT_CONFIG
+
/* Default capture configuration file when none is specified. */
static const char *default_config =
+#ifdef COMPAT_DEFAULT_CONFIG /* XXX: This policy is being moved to library
+ users. The next ABI-incompatible library
+ version will default to the empty string here. */
"[ExclusionList]\n"
"\\$ntfs.log\n"
"\\hiberfil.sys\n"
"*.zip\n"
"*.cab\n"
"\\WINDOWS\\inf\\*.pnf\n";
+#else
+"";
+#endif
static void destroy_pattern_list(struct pattern_list *list)
{
/* Parses the contents of the image capture configuration file and fills in a
* `struct capture_config'. */
-static int init_capture_config(const char *_config_str, size_t config_len,
- const char *_prefix, struct capture_config *config)
+static int init_capture_config(struct capture_config *config,
+ const char *_config_str, size_t config_len)
{
char *config_str;
- char *prefix;
char *p;
char *eol;
char *next_p;
ERROR("Could not duplicate capture config string");
return WIMLIB_ERR_NOMEM;
}
- prefix = STRDUP(_prefix);
- if (!prefix) {
- FREE(config_str);
- return WIMLIB_ERR_NOMEM;
- }
memcpy(config_str, _config_str, config_len);
next_p = config_str;
config->config_str = config_str;
- config->prefix = prefix;
- config->prefix_len = strlen(prefix);
while (bytes_remaining) {
line_no++;
p = next_p;
return ret;
}
+static int capture_config_set_prefix(struct capture_config *config,
+ const char *_prefix)
+{
+ char *prefix = STRDUP(_prefix);
+
+ if (!prefix)
+ return WIMLIB_ERR_NOMEM;
+ FREE(config->prefix);
+ config->prefix = prefix;
+ config->prefix_len = strlen(prefix);
+ return 0;
+}
+
static bool match_pattern(const char *path, const char *path_basename,
const struct pattern_list *list)
{
return false;
}
-static void print_pattern_list(const struct pattern_list *list)
-{
- for (size_t i = 0; i < list->num_pats; i++)
- printf(" %s\n", list->pats[i]);
-}
-
-static void print_capture_config(const struct capture_config *config)
-{
- if (config->exclusion_list.num_pats) {
- puts("Files or folders excluded from image capture:");
- print_pattern_list(&config->exclusion_list);
- putchar('\n');
- }
-}
-
/* Return true if the image capture configuration file indicates we should
* exclude the filename @path from capture.
*
}
-WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
- const char *name, const char *config_str,
- size_t config_len, int add_image_flags,
- wimlib_progress_func_t progress_func)
+/* Strip leading and trailing forward slashes from a string. Modifies it in
+ * place and returns the stripped string. */
+static const char *canonicalize_target_path(char *target_path)
+{
+ char *p;
+ if (target_path == NULL)
+ return "";
+ for (;;) {
+ if (*target_path == '\0')
+ return target_path;
+ else if (*target_path == '/')
+ target_path++;
+ else
+ break;
+ }
+
+ p = target_path + strlen(target_path) - 1;
+ while (*p == '/')
+ *p-- = '\0';
+ return target_path;
+}
+
+#if defined(__CYGWIN__) || defined(__WIN32__)
+static void zap_backslashes(char *s)
+{
+ while (*s) {
+ if (*s == '\\')
+ *s = '/';
+ s++;
+ }
+}
+#endif
+
+/* Strip leading and trailing slashes from the target paths */
+static void canonicalize_targets(struct wimlib_capture_source *sources,
+ size_t num_sources)
+{
+ while (num_sources--) {
+ DEBUG("Canonicalizing { source: \"%s\", target=\"%s\"}",
+ sources->fs_source_path,
+ sources->wim_target_path);
+#if defined(__CYGWIN__) || defined(__WIN32__)
+ /* The Windows API can handle forward slashes. Just get rid of
+ * backslashes to avoid confusing other parts of the library
+ * code. */
+ zap_backslashes(sources->fs_source_path);
+ if (sources->wim_target_path)
+ zap_backslashes(sources->wim_target_path);
+#endif
+ sources->wim_target_path =
+ (char*)canonicalize_target_path(sources->wim_target_path);
+ DEBUG("Canonical target: \"%s\"", sources->wim_target_path);
+ sources++;
+ }
+}
+
+static int capture_source_cmp(const void *p1, const void *p2)
+{
+ const struct wimlib_capture_source *s1 = p1, *s2 = p2;
+ return strcmp(s1->wim_target_path, s2->wim_target_path);
+}
+
+/* Sorts the capture sources lexicographically by target path. This occurs
+ * after leading and trailing forward slashes are stripped.
+ *
+ * One purpose of this is to make sure that target paths that are inside other
+ * target paths are added after the containing target paths. */
+static void sort_sources(struct wimlib_capture_source *sources,
+ size_t num_sources)
+{
+ qsort(sources, num_sources, sizeof(sources[0]), capture_source_cmp);
+}
+
+static int check_sorted_sources(struct wimlib_capture_source *sources,
+ size_t num_sources, int add_image_flags)
+{
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
+ if (num_sources != 1) {
+ ERROR("Must specify exactly 1 capture source "
+ "(the NTFS volume) in NTFS mode!");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+ if (sources[0].wim_target_path[0] != '\0') {
+ ERROR("In NTFS capture mode the target path inside "
+ "the image must be the root directory!");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+ } else if (num_sources != 0) {
+ /* This code is disabled because the current code
+ * unconditionally attempts to do overlays. So, duplicate
+ * target paths are OK. */
+ #if 0
+ if (num_sources > 1 && sources[0].wim_target_path[0] == '\0') {
+ ERROR("Cannot specify root target when using multiple "
+ "capture sources!");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+ for (size_t i = 0; i < num_sources - 1; i++) {
+ size_t len = strlen(sources[i].wim_target_path);
+ size_t j = i + 1;
+ const char *target1 = sources[i].wim_target_path;
+ do {
+ const char *target2 = sources[j].wim_target_path;
+ DEBUG("target1=%s, target2=%s",
+ target1,target2);
+ if (strncmp(target1, target2, len) ||
+ target2[len] > '/')
+ break;
+ if (target2[len] == '/') {
+ ERROR("Invalid target `%s': is a prefix of `%s'",
+ target1, target2);
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+ if (target2[len] == '\0') {
+ ERROR("Invalid target `%s': is a duplicate of `%s'",
+ target1, target2);
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+ } while (++j != num_sources);
+ }
+ #endif
+ }
+ return 0;
+
+}
+
+/* Creates a new directory to place in the WIM image. This is to create parent
+ * directories that are not part of any target as needed. */
+static struct wim_dentry *
+new_filler_directory(const char *name)
+{
+ struct wim_dentry *dentry;
+ DEBUG("Creating filler directory \"%s\"", name);
+ dentry = new_dentry_with_inode(name);
+ if (dentry) {
+ /* Set the inode number to 0 for now. The final inode number
+ * will be assigned later by assign_inode_numbers(). */
+ dentry->d_inode->i_ino = 0;
+ dentry->d_inode->i_resolved = 1;
+ dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
+ }
+ return dentry;
+}
+
+/* Transfers the children of @branch to @target. It is an error if @target is
+ * not a directory or if both @branch and @target contain a child dentry with
+ * the same name. */
+static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
+{
+ struct rb_root *rb_root;
+
+ if (!dentry_is_directory(target)) {
+ ERROR("Cannot overlay directory `%s' over non-directory",
+ branch->file_name_utf8);
+ return WIMLIB_ERR_INVALID_OVERLAY;
+ }
+
+ rb_root = &branch->d_inode->i_children;
+ while (rb_root->rb_node) { /* While @branch has children... */
+ struct wim_dentry *child = rbnode_dentry(rb_root->rb_node);
+ /* Move @child to the directory @target */
+ unlink_dentry(child);
+ if (!dentry_add_child(target, child)) {
+ /* Revert the change to avoid leaking the directory tree
+ * rooted at @child */
+ dentry_add_child(branch, child);
+ ERROR("Overlay error: file `%s' already exists "
+ "as a child of `%s'",
+ child->file_name_utf8, target->file_name_utf8);
+ return WIMLIB_ERR_INVALID_OVERLAY;
+ }
+ }
+ return 0;
+
+}
+
+/* Attach or overlay a branch onto the WIM image.
+ *
+ * @root_p:
+ * Pointer to the root of the WIM image, or pointer to NULL if it has not
+ * been created yet.
+ * @branch
+ * Branch to add.
+ * @target_path:
+ * Path in the WIM image to add the branch, with leading and trailing
+ * slashes stripped.
+ */
+static int attach_branch(struct wim_dentry **root_p,
+ struct wim_dentry *branch,
+ char *target_path)
{
- int (*capture_tree)(struct dentry **, const char *,
- struct lookup_table *,
+ char *slash;
+ struct wim_dentry *dentry, *parent, *target;
+
+ if (*target_path == '\0') {
+ /* Target: root directory */
+ if (*root_p) {
+ /* Overlay on existing root */
+ return do_overlay(*root_p, branch);
+ } else {
+ /* Set as root */
+ *root_p = branch;
+ return 0;
+ }
+ }
+
+ /* Adding a non-root branch. Create root if it hasn't been created
+ * already. */
+ if (!*root_p) {
+ *root_p = new_filler_directory("");
+ if (!*root_p)
+ return WIMLIB_ERR_NOMEM;
+ }
+
+ /* Walk the path to the branch, creating filler directories as needed.
+ * */
+ parent = *root_p;
+ while ((slash = strchr(target_path, '/'))) {
+ *slash = '\0';
+ dentry = get_dentry_child_with_name(parent, target_path);
+ if (!dentry) {
+ dentry = new_filler_directory(target_path);
+ if (!dentry)
+ return WIMLIB_ERR_NOMEM;
+ dentry_add_child(parent, dentry);
+ }
+ parent = dentry;
+ target_path = slash;
+ /* Skip over slashes. Note: this cannot overrun the length of
+ * the string because the last character cannot be a slash, as
+ * trailing slashes were tripped. */
+ do {
+ ++target_path;
+ } while (*target_path == '/');
+ }
+
+ /* If the target path already existed, overlay the branch onto it.
+ * Otherwise, set the branch as the target path. */
+ target = get_dentry_child_with_name(parent, branch->file_name_utf8);
+ if (target) {
+ return do_overlay(target, branch);
+ } else {
+ dentry_add_child(parent, branch);
+ return 0;
+ }
+}
+
+WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w,
+ struct wimlib_capture_source *sources,
+ size_t num_sources,
+ const char *name,
+ const char *config_str,
+ size_t config_len,
+ int add_image_flags,
+ wimlib_progress_func_t progress_func)
+{
+ int (*capture_tree)(struct wim_dentry **, const char *,
+ struct wim_lookup_table *,
struct wim_security_data *,
const struct capture_config *,
int, wimlib_progress_func_t, void *);
void *extra_arg;
-
- struct dentry *root_dentry = NULL;
+ struct wim_dentry *root_dentry;
+ struct wim_dentry *branch;
struct wim_security_data *sd;
struct capture_config config;
- struct image_metadata *imd;
+ struct wim_image_metadata *imd;
int ret;
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
#ifdef WITH_NTFS_3G
- if (add_image_flags & (WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE)) {
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) {
ERROR("Cannot dereference files when capturing directly from NTFS");
return WIMLIB_ERR_INVALID_PARAM;
}
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
+ ERROR("Capturing UNIX owner and mode not supported "
+ "when capturing directly from NTFS");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
capture_tree = build_dentry_tree_ntfs;
extra_arg = &w->ntfs_vol;
#else
extra_arg = NULL;
}
- DEBUG("Adding dentry tree from directory or NTFS volume `%s'.", source);
+#if defined(__CYGWIN__) || defined(__WIN32__)
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
+ ERROR("Capturing UNIX-specific data is not supported on Windows");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) {
+ ERROR("Dereferencing symbolic links is not supported on Windows");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+#endif
if (!name || !*name) {
ERROR("Must specify a non-empty string for the image name");
return WIMLIB_ERR_INVALID_PARAM;
}
- if (!source || !*source) {
- ERROR("Must specify the name of a directory or NTFS volume");
- return WIMLIB_ERR_INVALID_PARAM;
- }
if (w->hdr.total_parts != 1) {
ERROR("Cannot add an image to a split WIM");
return WIMLIB_ERR_IMAGE_NAME_COLLISION;
}
- DEBUG("Initializing capture configuration");
if (!config_str) {
DEBUG("Using default capture configuration");
config_str = default_config;
config_len = strlen(default_config);
}
- ret = init_capture_config(config_str, config_len, source, &config);
- if (ret != 0)
- return ret;
- print_capture_config(&config);
+ ret = init_capture_config(&config, config_str, config_len);
+ if (ret)
+ goto out;
DEBUG("Allocating security data");
-
sd = CALLOC(1, sizeof(struct wim_security_data));
if (!sd) {
ret = WIMLIB_ERR_NOMEM;
- goto out_destroy_config;
+ goto out_destroy_capture_config;
}
sd->total_length = 8;
sd->refcnt = 1;
- if (progress_func) {
- union wimlib_progress_info progress;
- progress.scan.source = source;
- progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
+ DEBUG("Using %zu capture sources", num_sources);
+ canonicalize_targets(sources, num_sources);
+ sort_sources(sources, num_sources);
+ ret = check_sorted_sources(sources, num_sources, add_image_flags);
+ if (ret) {
+ ret = WIMLIB_ERR_INVALID_PARAM;
+ goto out_free_security_data;
}
DEBUG("Building dentry tree.");
- ret = (*capture_tree)(&root_dentry, source, w->lookup_table, sd,
- &config, add_image_flags | WIMLIB_ADD_IMAGE_FLAG_ROOT,
- progress_func, extra_arg);
- destroy_capture_config(&config);
-
- if (ret != 0) {
- ERROR("Failed to build dentry tree for `%s'", source);
- goto out_free_security_data;
- }
+ if (num_sources == 0) {
+ root_dentry = new_filler_directory("");
+ if (!root_dentry) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_free_security_data;
+ }
+ } else {
+ size_t i;
- if (progress_func) {
- union wimlib_progress_info progress;
- progress.scan.source = source;
- progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress);
+#if defined(__CYGWIN__) || defined(__WIN32__)
+ win32_acquire_privilege(SE_BACKUP_NAME);
+ win32_acquire_privilege(SE_SECURITY_NAME);
+ win32_acquire_privilege(SE_TAKE_OWNERSHIP_NAME);
+#endif
+ root_dentry = NULL;
+ i = 0;
+ do {
+ int flags;
+ union wimlib_progress_info progress;
+
+ DEBUG("Building dentry tree for source %zu of %zu "
+ "(\"%s\" => \"%s\")", i + 1, num_sources,
+ sources[i].fs_source_path,
+ sources[i].wim_target_path);
+ if (progress_func) {
+ memset(&progress, 0, sizeof(progress));
+ progress.scan.source = sources[i].fs_source_path;
+ progress.scan.wim_target_path = sources[i].wim_target_path;
+ progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
+ }
+ ret = capture_config_set_prefix(&config,
+ sources[i].fs_source_path);
+ if (ret)
+ goto out_free_dentry_tree;
+ flags = add_image_flags | WIMLIB_ADD_IMAGE_FLAG_SOURCE;
+ if (!*sources[i].wim_target_path)
+ flags |= WIMLIB_ADD_IMAGE_FLAG_ROOT;
+ ret = (*capture_tree)(&branch, sources[i].fs_source_path,
+ w->lookup_table, sd,
+ &config,
+ flags,
+ progress_func, extra_arg);
+ if (ret) {
+ ERROR("Failed to build dentry tree for `%s'",
+ sources[i].fs_source_path);
+ goto out_free_dentry_tree;
+ }
+ if (branch) {
+ /* Use the target name, not the source name, for
+ * the root of each branch from a capture
+ * source. (This will also set the root dentry
+ * of the entire image to be unnamed.) */
+ ret = set_dentry_name(branch,
+ path_basename(sources[i].wim_target_path));
+ if (ret)
+ goto out_free_branch;
+
+ ret = attach_branch(&root_dentry, branch,
+ sources[i].wim_target_path);
+ if (ret)
+ goto out_free_branch;
+ }
+ if (progress_func)
+ progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress);
+ } while (++i != num_sources);
}
DEBUG("Calculating full paths of dentries.");
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
wimlib_set_boot_idx(w, w->hdr.image_count);
- return 0;
+ ret = 0;
+ goto out_destroy_capture_config;
out_destroy_imd:
destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
w->lookup_table);
w->hdr.image_count--;
- return ret;
+ goto out;
+out_free_branch:
+ free_dentry_tree(branch, w->lookup_table);
out_free_dentry_tree:
free_dentry_tree(root_dentry, w->lookup_table);
out_free_security_data:
free_security_data(sd);
-out_destroy_config:
+out_destroy_capture_config:
destroy_capture_config(&config);
+out:
+#if defined(__CYGWIN__) || defined(__WIN32__)
+ win32_release_privilege(SE_BACKUP_NAME);
+ win32_release_privilege(SE_SECURITY_NAME);
+ win32_release_privilege(SE_TAKE_OWNERSHIP_NAME);
+#endif
+ return ret;
+}
+
+WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
+ const char *name, const char *config_str,
+ size_t config_len, int add_image_flags,
+ wimlib_progress_func_t progress_func)
+{
+ if (!source || !*source)
+ return WIMLIB_ERR_INVALID_PARAM;
+
+ char *fs_source_path = STRDUP(source);
+ int ret;
+ struct wimlib_capture_source capture_src = {
+ .fs_source_path = fs_source_path,
+ .wim_target_path = NULL,
+ .reserved = 0,
+ };
+ ret = wimlib_add_image_multisource(w, &capture_src, 1, name,
+ config_str, config_len,
+ add_image_flags, progress_func);
+ FREE(fs_source_path);
return ret;
}
git://wimlib.net / wimlib / blobdiff