X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=3401deb3f922ba838104a0907f8140aa635953a1;hp=a57541f99711d94b474df35e69400269cbaf45e2;hb=640fa284ff84f55b73dc06b25bd5b32e3e38a8b8;hpb=2a33c303e30fd740f740e21632fd06b9e414b0c7 diff --git a/src/add_image.c b/src/add_image.c index a57541f9..3401deb3 100644 --- a/src/add_image.c +++ b/src/add_image.c @@ -23,52 +23,39 @@ #include "config.h" -#if defined(__CYGWIN__) || defined(__WIN32__) -# include -# include -# include -# ifdef ERROR -# undef ERROR -# endif -# include "security.h" -#else -# include -# include -# include "timestamp.h" -#endif - #ifdef __WIN32__ -#include +# include "win32.h" +#else +# include +# include +# include +# include "timestamp.h" #endif #include "wimlib_internal.h" #include "dentry.h" #include "lookup_table.h" #include "xml.h" +#include "security.h" + #include #include - -#ifndef __WIN32__ -#include -#endif - #include #include + #include #ifdef HAVE_ALLOCA_H -#include +# include #endif -#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000 -#define WIMLIB_ADD_IMAGE_FLAG_SOURCE 0x40000000 - /* * 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 wim_dentry *root_dentry, - struct wim_security_data *sd) +int +add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry, + struct wim_security_data *sd) { struct wim_lookup_table_entry *metadata_lte; struct wim_image_metadata *imd; @@ -93,8 +80,6 @@ int add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry, goto err_free_imd; metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA; - random_hash(metadata_lte->hash); - lookup_table_insert(w->lookup_table, metadata_lte); new_imd = &imd[w->hdr.image_count]; @@ -114,449 +99,17 @@ err: } -#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, - (PSECURITY_DESCRIPTOR)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 - +#ifndef __WIN32__ /* - * build_dentry_tree(): + * unix_build_dentry_tree(): * Recursively builds a tree of WIM dentries from an on-disk directory - * tree. + * tree (UNIX version; no NTFS-specific data is captured). * * @root_ret: Place to return a pointer to the root of the dentry tree. Only * 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 (UTF-8). + * @root_disk_path: The path to the root of the directory tree on disk. * * @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, @@ -564,15 +117,14 @@ out_find_close: * These lookup table entries that are added point to the path of * the file on disk. * - * @sd: Ignored. (Security data only captured in NTFS mode.) + * @sd_set: Ignored. (Security data only captured in NTFS mode.) * * @capture_config: * Configuration for files to be excluded from capture. * * @add_flags: Bitwise or of WIMLIB_ADD_IMAGE_FLAG_* * - * @extra_arg: Ignored in UNIX builds; used to pass sd_set pointer in Windows - * builds. + * @extra_arg: Ignored * * @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 @@ -581,14 +133,15 @@ out_find_close: * the on-disk files during a call to wimlib_write() or * wimlib_overwrite(). */ -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 +unix_build_dentry_tree(struct wim_dentry **root_ret, + const char *root_disk_path, + struct wim_lookup_table *lookup_table, + struct sd_set *sd_set, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg) { struct wim_dentry *root = NULL; int ret = 0; @@ -620,7 +173,6 @@ static int build_dentry_tree(struct wim_dentry **root_ret, 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); @@ -661,23 +213,17 @@ static int build_dentry_tree(struct wim_dentry **root_ret, goto out; } - 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; + ret = new_dentry_with_timeless_inode(path_basename(root_disk_path), + &root); + if (ret) goto out; - } inode = root->d_inode; #ifdef HAVE_STAT_NANOSECOND_PRECISION - 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); + 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->i_creation_time = unix_timestamp_to_wim(root_stbuf.st_mtime); inode->i_last_write_time = unix_timestamp_to_wim(root_stbuf.st_mtime); @@ -789,9 +335,11 @@ static int build_dentry_tree(struct wim_dentry **root_ret, || (result->d_name[1] == '.' && result->d_name[2] == '\0'))) continue; strcpy(name + len + 1, result->d_name); - ret = build_dentry_tree(&child, name, lookup_table, - NULL, config, add_image_flags, - progress_func, NULL); + ret = unix_build_dentry_tree(&child, name, + lookup_table, + NULL, config, + add_image_flags, + progress_func, NULL); if (ret != 0) break; if (child) @@ -841,126 +389,6 @@ static int build_dentry_tree(struct wim_dentry **root_ret, 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; @@ -968,6 +396,7 @@ out: free_dentry_tree(root, lookup_table); return ret; } +#endif /* !__WIN32__ */ enum pattern_type { NONE = 0, @@ -980,10 +409,11 @@ enum pattern_type { #define COMPAT_DEFAULT_CONFIG /* Default capture configuration file when none is specified. */ -static const char *default_config = +static const tchar *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. */ +T( "[ExclusionList]\n" "\\$ntfs.log\n" "\\hiberfil.sys\n" @@ -991,22 +421,19 @@ static const char *default_config = "\\System Volume Information\n" "\\RECYCLER\n" "\\Windows\\CSC\n" -"\n" -"[CompressionExclusionList]\n" -"*.mp3\n" -"*.zip\n" -"*.cab\n" -"\\WINDOWS\\inf\\*.pnf\n"; +); #else -""; +T(""); #endif -static void destroy_pattern_list(struct pattern_list *list) +static void +destroy_pattern_list(struct pattern_list *list) { FREE(list->pats); } -static void destroy_capture_config(struct capture_config *config) +static void +destroy_capture_config(struct capture_config *config) { destroy_pattern_list(&config->exclusion_list); destroy_pattern_list(&config->exclusion_exception); @@ -1017,10 +444,10 @@ static void destroy_capture_config(struct capture_config *config) memset(config, 0, sizeof(*config)); } -static int pattern_list_add_pattern(struct pattern_list *list, - const char *pattern) +static int +pattern_list_add_pattern(struct pattern_list *list, const tchar *pattern) { - const char **pats; + const tchar **pats; if (list->num_pats >= list->num_allocated_pats) { pats = REALLOC(list->pats, sizeof(list->pats[0]) * (list->num_allocated_pats + 8)); @@ -1035,34 +462,36 @@ static int pattern_list_add_pattern(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(struct capture_config *config, - const char *_config_str, size_t config_len) +static int +init_capture_config(struct capture_config *config, + const tchar *_config_str, + size_t config_num_tchars) { - char *config_str; - char *p; - char *eol; - char *next_p; - size_t bytes_remaining; + tchar *config_str; + tchar *p; + tchar *eol; + tchar *next_p; + size_t num_tchars_remaining; enum pattern_type type = NONE; int ret; unsigned long line_no = 0; - DEBUG("config_len = %zu", config_len); - bytes_remaining = config_len; + DEBUG("config_num_tchars = %zu", config_num_tchars); + num_tchars_remaining = config_num_tchars; memset(config, 0, sizeof(*config)); - config_str = MALLOC(config_len); + config_str = TMALLOC(config_num_tchars); if (!config_str) { ERROR("Could not duplicate capture config string"); return WIMLIB_ERR_NOMEM; } - memcpy(config_str, _config_str, config_len); + tmemcpy(config_str, _config_str, config_num_tchars); next_p = config_str; config->config_str = config_str; - while (bytes_remaining) { + while (num_tchars_remaining != 0) { line_no++; p = next_p; - eol = memchr(p, '\n', bytes_remaining); + eol = tmemchr(p, T('\n'), num_tchars_remaining); if (!eol) { ERROR("Expected end-of-line in capture config file on " "line %lu", line_no); @@ -1071,50 +500,52 @@ static int init_capture_config(struct capture_config *config, } next_p = eol + 1; - bytes_remaining -= (next_p - p); + num_tchars_remaining -= (next_p - p); if (eol == p) continue; - if (*(eol - 1) == '\r') + if (*(eol - 1) == T('\r')) eol--; - *eol = '\0'; + *eol = T('\0'); /* Translate backslash to forward slash */ - for (char *pp = p; pp != eol; pp++) - if (*pp == '\\') - *pp = '/'; + for (tchar *pp = p; pp != eol; pp++) + if (*pp == T('\\')) + *pp = T('/'); - /* Remove drive letter */ - if (eol - p > 2 && isalpha(*p) && *(p + 1) == ':') + /* Remove drive letter (UNIX only) */ + #ifndef __WIN32__ + if (eol - p > 2 && istalpha(*p) && *(p + 1) == T(':')) p += 2; + #endif ret = 0; - if (strcmp(p, "[ExclusionList]") == 0) + if (!tstrcmp(p, T("[ExclusionList]"))) type = EXCLUSION_LIST; - else if (strcmp(p, "[ExclusionException]") == 0) + else if (!tstrcmp(p, T("[ExclusionException]"))) type = EXCLUSION_EXCEPTION; - else if (strcmp(p, "[CompressionExclusionList]") == 0) + else if (!tstrcmp(p, T("[CompressionExclusionList]"))) type = COMPRESSION_EXCLUSION_LIST; - else if (strcmp(p, "[AlignmentList]") == 0) + else if (!tstrcmp(p, T("[AlignmentList]"))) type = ALIGNMENT_LIST; - else if (p[0] == '[' && strrchr(p, ']')) { - ERROR("Unknown capture configuration section `%s'", p); + else if (p[0] == T('[') && tstrrchr(p, T(']'))) { + ERROR("Unknown capture configuration section \"%"TS"\"", p); ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; } else switch (type) { case EXCLUSION_LIST: - DEBUG("Adding pattern \"%s\" to exclusion list", p); + DEBUG("Adding pattern \"%"TS"\" to exclusion list", p); ret = pattern_list_add_pattern(&config->exclusion_list, p); break; case EXCLUSION_EXCEPTION: - DEBUG("Adding pattern \"%s\" to exclusion exception list", p); + DEBUG("Adding pattern \"%"TS"\" to exclusion exception list", p); ret = pattern_list_add_pattern(&config->exclusion_exception, p); break; case COMPRESSION_EXCLUSION_LIST: - DEBUG("Adding pattern \"%s\" to compression exclusion list", p); + DEBUG("Adding pattern \"%"TS"\" to compression exclusion list", p); ret = pattern_list_add_pattern(&config->compression_exclusion_list, p); break; case ALIGNMENT_LIST: - DEBUG("Adding pattern \"%s\" to alignment list", p); + DEBUG("Adding pattern \"%"TS"\" to alignment list", p); ret = pattern_list_add_pattern(&config->alignment_list, p); break; default: @@ -1134,42 +565,30 @@ out_destroy: } static int capture_config_set_prefix(struct capture_config *config, - const char *_prefix) + const tchar *_prefix) { - char *prefix = STRDUP(_prefix); + tchar *prefix = TSTRDUP(_prefix); if (!prefix) return WIMLIB_ERR_NOMEM; FREE(config->prefix); config->prefix = prefix; - config->prefix_len = strlen(prefix); + config->prefix_num_tchars = tstrlen(prefix); return 0; } -static bool path_matches_pattern(const char *path, const char *pattern) -{ -#ifdef __WIN32__ - return PathMatchSpecA(path, pattern); -#else - return fnmatch(pattern, path, FNM_PATHNAME - #ifdef FNM_CASEFOLD - | FNM_CASEFOLD - #endif - ) == 0; -#endif -} - -static bool match_pattern(const char *path, const char *path_basename, +static bool match_pattern(const tchar *path, + const tchar *path_basename, const struct pattern_list *list) { for (size_t i = 0; i < list->num_pats; i++) { - const char *pat = list->pats[i]; - const char *string; + const tchar *pat = list->pats[i]; + const tchar *string; if (pat[0] == '/') /* Absolute path from root of capture */ string = path; else { - if (strchr(pat, '/')) + if (tstrchr(pat, T('/'))) /* Relative path from root of capture */ string = path + 1; else @@ -1177,8 +596,15 @@ static bool match_pattern(const char *path, const char *path_basename, string = path_basename; } - if (path_matches_pattern(string, pat)) { - DEBUG("`%s' matches the pattern \"%s\"", + /* Warning: on Windows native builds, fnmatch() calls the + * replacement function in win32.c. */ + if (fnmatch(pat, string, FNM_PATHNAME + #ifdef FNM_CASEFOLD + | FNM_CASEFOLD + #endif + ) == 0) + { + DEBUG("\"%"TS"\" matches the pattern \"%"TS"\"", string, pat); return true; } @@ -1195,15 +621,18 @@ static bool match_pattern(const char *path, const char *path_basename, * file /mnt/windows7/hiberfil.sys if we are capturing the /mnt/windows7 * directory. */ -bool exclude_path(const char *path, const struct capture_config *config, - bool exclude_prefix) +bool +exclude_path(const tchar *path, const struct capture_config *config, + bool exclude_prefix) { - const char *basename = path_basename(path); + const tchar *basename = path_basename(path); if (exclude_prefix) { - wimlib_assert(strlen(path) >= config->prefix_len); - if (memcmp(config->prefix, path, config->prefix_len) == 0 - && path[config->prefix_len] == '/') - path += config->prefix_len; + wimlib_assert(tstrlen(path) >= config->prefix_num_tchars); + if (!tmemcmp(config->prefix, path, config->prefix_num_tchars) && + path[config->prefix_num_tchars] == T('/')) + { + path += config->prefix_num_tchars; + } } return match_pattern(path, basename, &config->exclusion_list) && !match_pattern(path, basename, &config->exclusion_exception); @@ -1212,64 +641,55 @@ bool exclude_path(const char *path, const struct capture_config *config, /* 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) +static const tchar * +canonicalize_target_path(tchar *target_path) { - char *p; + tchar *p; if (target_path == NULL) - return ""; + return T(""); for (;;) { - if (*target_path == '\0') + if (*target_path == T('\0')) return target_path; - else if (*target_path == '/') + else if (*target_path == T('/')) target_path++; else break; } - p = target_path + strlen(target_path) - 1; - while (*p == '/') - *p-- = '\0'; + p = tstrchr(target_path, T('\0')) - 1; + while (*p == T('/')) + *p-- = T('\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) +static void +canonicalize_targets(struct wimlib_capture_source *sources, size_t num_sources) { while (num_sources--) { - DEBUG("Canonicalizing { source: \"%s\", target=\"%s\"}", + DEBUG("Canonicalizing { source: \"%"TS"\", target=\"%"TS"\"}", 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); + (tchar*)canonicalize_target_path(sources->wim_target_path); + DEBUG("Canonical target: \"%"TS"\"", sources->wim_target_path); sources++; } } -static int capture_source_cmp(const void *p1, const void *p2) +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); + return tstrcmp(s1->wim_target_path, s2->wim_target_path); } /* Sorts the capture sources lexicographically by target path. This occurs @@ -1277,14 +697,15 @@ static int capture_source_cmp(const void *p1, const void *p2) * * 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) +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) +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) { @@ -1292,7 +713,7 @@ static int check_sorted_sources(struct wimlib_capture_source *sources, "(the NTFS volume) in NTFS mode!"); return WIMLIB_ERR_INVALID_PARAM; } - if (sources[0].wim_target_path[0] != '\0') { + if (sources[0].wim_target_path[0] != T('\0')) { ERROR("In NTFS capture mode the target path inside " "the image must be the root directory!"); return WIMLIB_ERR_INVALID_PARAM; @@ -1338,34 +759,38 @@ static int check_sorted_sources(struct wimlib_capture_source *sources, /* 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) +static int +new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret) { + int ret; struct wim_dentry *dentry; - DEBUG("Creating filler directory \"%s\"", name); - dentry = new_dentry_with_inode(name); - if (dentry) { + + DEBUG("Creating filler directory \"%"TS"\"", name); + ret = new_dentry_with_inode(name, &dentry); + if (ret == 0) { /* Leave the inode number as 0 for now. The final inode number * will be assigned later by assign_inode_numbers(). */ dentry->d_inode->i_resolved = 1; dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY; + *dentry_ret = dentry; } - return dentry; + return ret; } /* 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) +static int +do_overlay(struct wim_dentry *target, struct wim_dentry *branch) { struct rb_root *rb_root; - DEBUG("Doing overlay %s => %s", - branch->file_name_utf8, target->file_name_utf8); + DEBUG("Doing overlay \"%"WS"\" => \"%"WS"\"", + branch->file_name, target->file_name); if (!dentry_is_directory(target)) { - ERROR("Cannot overlay directory `%s' over non-directory", - branch->file_name_utf8); + ERROR("Cannot overlay directory \"%"WS"\" " + "over non-directory", branch->file_name); return WIMLIB_ERR_INVALID_OVERLAY; } @@ -1378,9 +803,9 @@ static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch) /* 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); + ERROR("Overlay error: file \"%"WS"\" already exists " + "as a child of \"%"WS"\"", + child->file_name, target->file_name); return WIMLIB_ERR_INVALID_OVERLAY; } } @@ -1400,17 +825,18 @@ static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch) * 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) +static int +attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, + tchar *target_path) { - char *slash; + tchar *slash; struct wim_dentry *dentry, *parent, *target; + int ret; - DEBUG("Attaching branch \"%s\" => \"%s\"", - branch->file_name_utf8, target_path); + DEBUG("Attaching branch \"%"WS"\" => \"%"TS"\"", + branch->file_name, target_path); - if (*target_path == '\0') { + if (*target_path == T('\0')) { /* Target: root directory */ if (*root_p) { /* Overlay on existing root */ @@ -1425,21 +851,21 @@ static int attach_branch(struct wim_dentry **root_p, /* 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; + ret = new_filler_directory(T(""), root_p); + if (ret) + return ret; } /* Walk the path to the branch, creating filler directories as needed. * */ parent = *root_p; - while ((slash = strchr(target_path, '/'))) { - *slash = '\0'; + while ((slash = tstrchr(target_path, T('/')))) { + *slash = T('\0'); dentry = get_dentry_child_with_name(parent, target_path); if (!dentry) { - dentry = new_filler_directory(target_path); - if (!dentry) - return WIMLIB_ERR_NOMEM; + ret = new_filler_directory(target_path, &dentry); + if (ret) + return ret; dentry_add_child(parent, dentry); } parent = dentry; @@ -1449,12 +875,13 @@ static int attach_branch(struct wim_dentry **root_p, * trailing slashes were tripped. */ do { ++target_path; - } while (*target_path == '/'); + } while (*target_path == T('/')); } /* 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); + target = get_dentry_child_with_utf16le_name(parent, branch->file_name, + branch->file_name_nbytes); if (target) { return do_overlay(target, branch); } else { @@ -1463,20 +890,24 @@ static int attach_branch(struct wim_dentry **root_p, } } -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) +WIMLIBAPI int +wimlib_add_image_multisource(WIMStruct *w, + struct wimlib_capture_source *sources, + size_t num_sources, + const tchar *name, + const tchar *config_str, + size_t config_len, + int add_image_flags, + wimlib_progress_func_t progress_func) { - int (*capture_tree)(struct wim_dentry **, const char *, + int (*capture_tree)(struct wim_dentry **, + const tchar *, struct wim_lookup_table *, - struct wim_security_data *, + struct sd_set *, const struct capture_config *, - int, wimlib_progress_func_t, void *); + int, + wimlib_progress_func_t, + void *); void *extra_arg; struct wim_dentry *root_dentry; struct wim_dentry *branch; @@ -1484,6 +915,7 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, struct capture_config config; struct wim_image_metadata *imd; int ret; + struct sd_set sd_set; if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) { #ifdef WITH_NTFS_3G @@ -1504,11 +936,15 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, return WIMLIB_ERR_UNSUPPORTED; #endif } else { - capture_tree = build_dentry_tree; + #ifdef __WIN32__ + capture_tree = win32_build_dentry_tree; + #else + capture_tree = unix_build_dentry_tree; + #endif extra_arg = NULL; } -#if defined(__CYGWIN__) || defined(__WIN32__) +#ifdef __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; @@ -1530,15 +966,15 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, } if (wimlib_image_name_in_use(w, name)) { - ERROR("There is already an image named \"%s\" in `%s'", - name, w->filename); + ERROR("There is already an image named \"%"TS"\" in the WIM!", + name); return WIMLIB_ERR_IMAGE_NAME_COLLISION; } if (!config_str) { DEBUG("Using default capture configuration"); config_str = default_config; - config_len = strlen(default_config); + config_len = tstrlen(default_config); } ret = init_capture_config(&config, config_str, config_len); if (ret) @@ -1553,6 +989,9 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, sd->total_length = 8; sd->refcnt = 1; + sd_set.sd = sd; + sd_set.rb_root.rb_node = NULL; + DEBUG("Using %zu capture sources", num_sources); canonicalize_targets(sources, num_sources); sort_sources(sources, num_sources); @@ -1563,130 +1002,124 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, } DEBUG("Building dentry tree."); - if (num_sources == 0) { - root_dentry = new_filler_directory(""); - if (!root_dentry) { - ret = WIMLIB_ERR_NOMEM; - goto out_free_security_data; + root_dentry = NULL; + + for (size_t i = 0; i < num_sources; i++) { + int flags; + union wimlib_progress_info progress; + + DEBUG("Building dentry tree for source %zu of %zu " + "(\"%"TS"\" => \"%"TS"\")", 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); } - } else { - size_t i; + 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_set, + &config, + flags, + progress_func, extra_arg); + if (ret) { + ERROR("Failed to build dentry tree for `%"TS"'", + 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; -#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); + ret = attach_branch(&root_dentry, branch, + sources[i].wim_target_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); + goto out_free_branch; + } + if (progress_func) + progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress); + } + + if (root_dentry == NULL) { + ret = new_filler_directory(T(""), &root_dentry); + if (ret) + goto out_free_dentry_tree; } DEBUG("Calculating full paths of dentries."); ret = for_dentry_in_tree(root_dentry, calculate_dentry_full_path, NULL); - if (ret != 0) + if (ret) goto out_free_dentry_tree; ret = add_new_dentry_tree(w, root_dentry, sd); - if (ret != 0) + if (ret) goto out_free_dentry_tree; imd = &w->image_metadata[w->hdr.image_count - 1]; ret = dentry_tree_fix_inodes(root_dentry, &imd->inode_list); - if (ret != 0) + if (ret) goto out_destroy_imd; DEBUG("Assigning hard link group IDs"); assign_inode_numbers(&imd->inode_list); ret = xml_add_image(w, name); - if (ret != 0) + if (ret) goto out_destroy_imd; if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT) wimlib_set_boot_idx(w, w->hdr.image_count); ret = 0; - goto out_destroy_capture_config; + goto out_destroy_sd_set; out_destroy_imd: destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1], w->lookup_table); w->hdr.image_count--; - goto out; + goto out_destroy_sd_set; 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_sd_set: + destroy_sd_set(&sd_set); 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) +WIMLIBAPI int +wimlib_add_image(WIMStruct *w, + const tchar *source, + const tchar *name, + const tchar *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); + tchar *fs_source_path = TSTRDUP(source); int ret; struct wimlib_capture_source capture_src = { .fs_source_path = fs_source_path,