X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=cf89e695dc986389ad7dd5a3d0da72c0f4c6ac66;hp=fa3e77b04d33224c906af258a7d8b1a69c32f3e9;hb=541b65d79e0c73238a25e2c2661711d8593d0684;hpb=ebd6c0ec0ff47ac18af4ef918fd78fb8d9f19540 diff --git a/src/add_image.c b/src/add_image.c index fa3e77b0..cf89e695 100644 --- a/src/add_image.c +++ b/src/add_image.c @@ -21,57 +21,39 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ +#include "config.h" -#if defined(__CYGWIN__) || defined(__WIN32__) -# include -# include -# include -# include -# include -# ifdef ERROR -# undef ERROR -# endif -# include "security.h" +#ifdef __WIN32__ +# include "win32.h" +#else +# include +# include +# include +# include "timestamp.h" #endif #include "wimlib_internal.h" #include "dentry.h" -#include "timestamp.h" #include "lookup_table.h" #include "xml.h" -#include -#include -#include + #include -#include -#include #include +#include +#include #include -#if defined(__CYGWIN__) || defined(__WIN32__) -/*#define ERROR_WIN32_SAFE(format, ...) \*/ -/*{( \*/ - /*DWORD err = GetLastError(); \*/ - /*ERROR(format, ##__VA_ARGS__); \*/ - /*SetLastError(err); \*/ -/*)}*/ -#define DEBUG_WIN32_SAFE(format, ...) \ -({ \ - DWORD err = GetLastError(); \ - DEBUG(format, ##__VA_ARGS__); \ - SetLastError(err); \ -}) +#ifdef HAVE_ALLOCA_H +# 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; @@ -117,413 +99,7 @@ err: } -#if defined(__CYGWIN__) || defined(__WIN32__) -static u64 FILETIME_to_u64(const FILETIME *ft) -{ - return ((u64)ft->dwHighDateTime << 32) | (u64)ft->dwLowDateTime; -} - -#ifdef ENABLE_ERROR_MESSAGES -static void win32_error(DWORD err_code) -{ - char *buffer; - DWORD nchars; - nchars = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, err_code, 0, - (char*)&buffer, 0, NULL); - if (nchars == 0) { - ERROR("Error printing error message! " - "Computer will self-destruct in 3 seconds."); - } else { - ERROR("Win32 error: %s", buffer); - LocalFree(buffer); - } -} -#else -#define win32_error(err_code) -#endif - -static HANDLE win32_open_file(const wchar_t *path) -{ - return CreateFileW(path, - GENERIC_READ | READ_CONTROL, - FILE_SHARE_READ, - NULL, /* lpSecurityAttributes */ - OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS | - FILE_FLAG_OPEN_REPARSE_POINT, - NULL /* hTemplateFile */); -} - -int win32_read_file(const char *filename, - void *handle, u64 offset, size_t size, u8 *buf) -{ - HANDLE h = handle; - DWORD err; - DWORD bytesRead; - LARGE_INTEGER liOffset = {.QuadPart = offset}; - - wimlib_assert(size <= 0xffffffff); - - if (SetFilePointerEx(h, liOffset, NULL, FILE_BEGIN)) - if (ReadFile(h, buf, size, &bytesRead, NULL) && bytesRead == size) - return 0; - err = GetLastError(); - ERROR("Error reading \"%s\"", filename); - win32_error(err); - return WIMLIB_ERR_READ; -} - -void win32_close_handle(void *handle) -{ - CloseHandle((HANDLE)handle); -} - -void *win32_open_handle(const char *path_utf16) -{ - return (void*)win32_open_file((const wchar_t*)path_utf16); -} - -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, - const char *path) -{ - SECURITY_INFORMATION requestedInformation; - DWORD lenNeeded = 0; - BOOL status; - DWORD err; - -#ifdef BACKUP_SECURITY_INFORMATION - requestedInformation = BACKUP_SECURITY_INFORMATION; -#else - requestedInformation = DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION | - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION; -#endif - /* Request length of security descriptor */ - status = GetFileSecurityW(path_utf16, requestedInformation, - NULL, 0, &lenNeeded); - err = GetLastError(); - - /* Error code appears to be ERROR_INSUFFICIENT_BUFFER but - * GetFileSecurity is poorly documented... */ - if (err == ERROR_INSUFFICIENT_BUFFER || err == NO_ERROR) { - 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 \"%s\"", - path); - win32_error(err); - return WIMLIB_ERR_READ; -} - - -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; - - { - 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 { - 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) + 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; -} - -static int win32_capture_reparse_point(const char *path, - HANDLE hFile, - struct wim_inode *inode, - struct wim_lookup_table *lookup_table) -{ - /* "Reparse point data, including the tag and optional GUID, - * cannot exceed 16 kilobytes." - MSDN */ - char reparse_point_buf[16 * 1024]; - DWORD bytesReturned; - const REPARSE_DATA_BUFFER *buf; - - if (!DeviceIoControl(hFile, FSCTL_GET_REPARSE_POINT, - NULL, 0, reparse_point_buf, - sizeof(reparse_point_buf), &bytesReturned, NULL)) - { - ERROR("Win32 API: Failed to get reparse data of \"%s\"", path); - return WIMLIB_ERR_READ; - } - buf = (const REPARSE_DATA_BUFFER*)reparse_point_buf; - inode->i_reparse_tag = buf->ReparseTag; - return inode_add_ads_with_data(inode, "", (const u8*)buf + 8, - bytesReturned - 8, lookup_table); -} - -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(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; -} - -static int win32_capture_stream(const char *path, - 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; - - p = dat->cStreamName; - wimlib_assert(*p == L':'); - p += 1; - colon = wcschr(p, L':'); - wimlib_assert(colon != NULL); - - if (wcscmp(colon + 1, L"$DATA")) { - /* Not a DATA stream */ - ret = 0; - goto out; - } - - is_named_stream = (p != colon); - - if (is_named_stream) { - char *utf8_stream_name; - size_t utf8_stream_name_len; - ret = utf16_to_utf8((const char *)p, - colon - p, - &utf8_stream_name, - &utf8_stream_name_len); - if (ret) - goto out; - DEBUG_WIN32_SAFE("Add alternate data stream %s:%s", path, utf8_stream_name); - ads_entry = inode_add_ads(inode, utf8_stream_name); - FREE(utf8_stream_name); - if (!ads_entry) { - ret = WIMLIB_ERR_NOMEM; - goto out; - } - } - - *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 \"%s\" to calculate SHA1sum", path); - win32_error(err); - goto out_free_spath; - } - - lte = __lookup_resource(lookup_table, hash); - if (lte) { - lte->refcnt++; - } else { - 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; -} - -static int win32_capture_streams(const char *path, - 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) { - ERROR("Win32 API: Failed to look up data streams of \"%s\"", - path); - return WIMLIB_ERR_READ; - } - do { - ret = win32_capture_stream(path, 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 \"%s\"", path); - win32_error(err); - ret = WIMLIB_ERR_READ; - } -out_find_close: - FindClose(hFind); - return ret; -} -#endif - +#ifndef __WIN32__ /* * build_dentry_tree(): * Recursively builds a tree of WIM dentries from an on-disk directory @@ -548,7 +124,8 @@ out_find_close: * * @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 @@ -557,14 +134,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 mbchar *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) { struct wim_dentry *root = NULL; int ret = 0; @@ -596,7 +174,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); @@ -637,33 +214,31 @@ 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); inode->i_last_access_time = unix_timestamp_to_wim(root_stbuf.st_atime); #endif - if (sizeof(ino_t) >= 8) - inode->i_ino = (u64)root_stbuf.st_ino; - else - inode->i_ino = (u64)root_stbuf.st_ino | - ((u64)root_stbuf.st_dev << ((sizeof(ino_t) * 8) & 63)); + /* Leave the inode number at 0 for directories. */ + if (!S_ISDIR(root_stbuf.st_mode)) { + if (sizeof(ino_t) >= 8) + inode->i_ino = (u64)root_stbuf.st_ino; + else + inode->i_ino = (u64)root_stbuf.st_ino | + ((u64)root_stbuf.st_dev << + ((sizeof(ino_t) * 8) & 63)); + } inode->i_resolved = 1; if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) { ret = inode_set_unix_data(inode, root_stbuf.st_uid, @@ -701,7 +276,7 @@ static int build_dentry_tree(struct wim_dentry **root_ret, DEBUG("Add lte reference %u for `%s'", lte->refcnt, root_disk_path); } else { - char *file_on_disk = STRDUP(root_disk_path); + mbchar *file_on_disk = STRDUP(root_disk_path); if (!file_on_disk) { ERROR("Failed to allocate memory for file path"); ret = WIMLIB_ERR_NOMEM; @@ -739,7 +314,7 @@ static int build_dentry_tree(struct wim_dentry **root_ret, /* Buffer for names of files in directory. */ size_t len = strlen(root_disk_path); - char name[len + 1 + FILENAME_MAX + 1]; + mbchar name[len + 1 + FILENAME_MAX + 1]; memcpy(name, root_disk_path, len); name[len] = '/'; @@ -761,9 +336,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) @@ -781,7 +358,7 @@ static int build_dentry_tree(struct wim_dentry **root_ret, * drive letter). */ - char deref_name_buf[4096]; + mbchar deref_name_buf[4096]; ssize_t deref_name_len; deref_name_len = readlink(root_disk_path, deref_name_buf, @@ -813,122 +390,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; - } - - DEBUG_WIN32_SAFE("root_disk_path=\"%s\"", root_disk_path); - 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); - - DEBUG_WIN32_SAFE("Win32: Opening file `%s'", root_disk_path); - HANDLE hFile = win32_open_file(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_free_path_utf16; - } - - /* 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, - root_disk_path); - if (ret) - goto out_close_handle; - - if (inode_is_directory(inode)) { - /* Directory (not a reparse point) --- recurse to children */ - DEBUG_WIN32_SAFE("Recursing to directory \"%s\"", root_disk_path); - 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 */ - - DEBUG_WIN32_SAFE("Capturing reparse point `%s'", root_disk_path); - ret = win32_capture_reparse_point(root_disk_path, - hFile, - inode, - lookup_table); - - } else { - DEBUG_WIN32_SAFE("Capturing streams of \"%s\"", root_disk_path); - /* Not a directory, not a reparse point */ - ret = win32_capture_streams(root_disk_path, - path_utf16, - path_utf16_nchars, - inode, - lookup_table); - } -out_close_handle: - CloseHandle(hFile); -out_destroy_sd_set: - if (extra_arg == NULL) - destroy_sd_set(sd_set); -out_free_path_utf16: - FREE(path_utf16); -#endif out: if (ret == 0) *root_ret = root; @@ -936,6 +397,7 @@ out: free_dentry_tree(root, lookup_table); return ret; } +#endif /* !__WIN32__ */ enum pattern_type { NONE = 0, @@ -948,7 +410,7 @@ enum pattern_type { #define COMPAT_DEFAULT_CONFIG /* Default capture configuration file when none is specified. */ -static const char *default_config = +static const mbchar *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. */ @@ -969,12 +431,14 @@ static const char *default_config = ""; #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); @@ -985,10 +449,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 mbchar *pattern) { - const char **pats; + const mbchar **pats; if (list->num_pats >= list->num_allocated_pats) { pats = REALLOC(list->pats, sizeof(list->pats[0]) * (list->num_allocated_pats + 8)); @@ -1003,13 +467,14 @@ 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 mbchar *_config_str, size_t config_len) { - char *config_str; - char *p; - char *eol; - char *next_p; + mbchar *config_str; + mbchar *p; + mbchar *eol; + mbchar *next_p; size_t bytes_remaining; enum pattern_type type = NONE; int ret; @@ -1048,7 +513,7 @@ static int init_capture_config(struct capture_config *config, *eol = '\0'; /* Translate backslash to forward slash */ - for (char *pp = p; pp != eol; pp++) + for (mbchar *pp = p; pp != eol; pp++) if (*pp == '\\') *pp = '/'; @@ -1102,9 +567,9 @@ out_destroy: } static int capture_config_set_prefix(struct capture_config *config, - const char *_prefix) + const mbchar *_prefix) { - char *prefix = STRDUP(_prefix); + mbchar *prefix = STRDUP(_prefix); if (!prefix) return WIMLIB_ERR_NOMEM; @@ -1114,12 +579,13 @@ static int capture_config_set_prefix(struct capture_config *config, return 0; } -static bool match_pattern(const char *path, const char *path_basename, +static bool match_pattern(const mbchar *path, + const mbchar *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 mbchar *pat = list->pats[i]; + const mbchar *string; if (pat[0] == '/') /* Absolute path from root of capture */ string = path; @@ -1131,11 +597,14 @@ static bool match_pattern(const char *path, const char *path_basename, /* A file name pattern */ string = path_basename; } + + /* 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) + #ifdef FNM_CASEFOLD + | FNM_CASEFOLD + #endif + ) == 0) { DEBUG("`%s' matches the pattern \"%s\"", string, pat); @@ -1154,10 +623,11 @@ 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 mbchar *path, const struct capture_config *config, + bool exclude_prefix) { - const char *basename = path_basename(path); + const mbchar *basename = path_basename(path); if (exclude_prefix) { wimlib_assert(strlen(path) >= config->prefix_len); if (memcmp(config->prefix, path, config->prefix_len) == 0 @@ -1171,11 +641,12 @@ 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 char * +canonicalize_target_path(char *target_path) { char *p; if (target_path == NULL) - target_path = ""; + return ""; for (;;) { if (*target_path == '\0') return target_path; @@ -1191,14 +662,34 @@ static const char *canonicalize_target_path(char *target_path) return target_path; } +#ifdef __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\"}", sources->fs_source_path, sources->wim_target_path); +#ifdef __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); @@ -1206,7 +697,8 @@ static void canonicalize_targets(struct wimlib_capture_source *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); @@ -1216,15 +708,16 @@ static int capture_source_cmp(const void *p1, const void *p2) * 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 extracted after the containing target paths. */ -static void sort_sources(struct wimlib_capture_source *sources, - size_t num_sources) + * 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) +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) { @@ -1278,32 +771,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 mbchar *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) { - /* Set the inode number to 0 for now. The final inode number + 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_ino = 0; 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 \"%W\" => \"%W\"", + 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 \"%W\" over non-directory", + branch->file_name); return WIMLIB_ERR_INVALID_OVERLAY; } @@ -1316,12 +815,13 @@ 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 \"%W\" already exists " + "as a child of \"%W\"", + child->file_name, target->file_name); return WIMLIB_ERR_INVALID_OVERLAY; } } + free_dentry(branch); return 0; } @@ -1337,12 +837,16 @@ 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, + mbchar *target_path) { - char *slash; + mbchar *slash; struct wim_dentry *dentry, *parent, *target; + int ret; + + DEBUG("Attaching branch \"%W\" => \"%s\"", + branch->file_name, target_path); if (*target_path == '\0') { /* Target: root directory */ @@ -1359,9 +863,9 @@ 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("", root_p); + if (ret) + return ret; } /* Walk the path to the branch, creating filler directories as needed. @@ -1371,9 +875,9 @@ static int attach_branch(struct wim_dentry **root_p, *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; + ret = new_filler_directory(target_path, &dentry); + if (ret) + return ret; dentry_add_child(parent, dentry); } parent = dentry; @@ -1388,7 +892,8 @@ static int attach_branch(struct wim_dentry **root_p, /* 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 { @@ -1397,20 +902,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 utf8char *name, + const mbchar *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 mbchar *, struct wim_lookup_table *, struct wim_security_data *, 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; @@ -1438,10 +947,25 @@ 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; } +#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; + } + 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; @@ -1453,8 +977,8 @@ 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 \"%U\" in the WIM!", + name); return WIMLIB_ERR_IMAGE_NAME_COLLISION; } @@ -1486,92 +1010,90 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, } DEBUG("Building dentry tree."); - if (num_sources == 0) { - root_dentry = new_filler_directory(""); - if (!root_dentry) - goto out_free_security_data; - } else { - size_t i; + 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 " + "(\"%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; - 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("" , &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; + goto out_destroy_capture_config; out_destroy_imd: destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1], w->lookup_table); @@ -1589,15 +1111,19 @@ out: 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 mbchar *source, + const utf8char *name, + const mbchar *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); + mbchar *fs_source_path = STRDUP(source); int ret; struct wimlib_capture_source capture_src = { .fs_source_path = fs_source_path,