X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.c;h=e074b951e7d4864da2d898f4c3fa83fc9f92e4cf;hp=e5b0d9e7ad586728387a06dd18f7c1f5515707f6;hb=16a0ef18b1404aab857696ae479e246dfbcfbaa3;hpb=980dec359010f14f558dc4708a689f450befea50 diff --git a/src/util.c b/src/util.c index e5b0d9e7..e074b951 100644 --- a/src/util.c +++ b/src/util.c @@ -3,386 +3,549 @@ */ /* - * Copyright (C) 2010 Carl Thijssen - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * A PARTICULAR PURPOSE. See the GNU General Public License for more * details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "wimlib_internal.h" -#include "endianness.h" -#include "sha1.h" -#include "timestamp.h" -#include - +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#ifdef _GNU_SOURCE +# define _GNU_SOURCE_DEFINED 1 +# undef _GNU_SOURCE +#endif +/* Make sure the POSIX-compatible strerror_r() is declared, rather than the GNU + * version, which has a different return type. */ #include -#include +#ifdef _GNU_SOURCE_DEFINED +# define _GNU_SOURCE +#endif + +#include "wimlib.h" +#include "wimlib/assert.h" +#include "wimlib/compiler.h" +#include "wimlib/encoding.h" +#include "wimlib/error.h" +#include "wimlib/types.h" +#include "wimlib/util.h" +#include "wimlib/xml.h" + +#ifdef __WIN32__ +# include "wimlib/win32.h" /* win32_strerror_r_replacement */ +#endif + +#include +#include #include #include #include -#include -/* True if wimlib is to print an informational message when an error occurs. - * This can be turned off by calling wimlib_set_print_errors(false). */ +size_t +utf16le_strlen(const utf16lechar *s) +{ + const utf16lechar *p = s; + while (*p) + p++; + return (p - s) * sizeof(utf16lechar); +} + #ifdef ENABLE_ERROR_MESSAGES -#include -bool __wimlib_print_errors = false; +bool wimlib_print_errors = false; +FILE *wimlib_error_file = NULL; /* Set in wimlib_global_init() */ +static bool wimlib_owns_error_file = false; +#endif -void wimlib_error(const char *format, ...) +#if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG) +static void +wimlib_vmsg(const tchar *tag, const tchar *format, + va_list va, bool perror) { - if (__wimlib_print_errors) { - va_list va; - int errno_save; - - va_start(va, format); - errno_save = errno; - fputs("[ERROR] ", stderr); - vfprintf(stderr, format, va); - putc('\n', stderr); +#if !defined(ENABLE_DEBUG) + if (wimlib_print_errors) +#endif + { + int errno_save = errno; + fflush(stdout); + tfputs(tag, wimlib_error_file); + tvfprintf(wimlib_error_file, format, va); + if (perror && errno_save != 0) { + tchar buf[64]; + int res; + res = tstrerror_r(errno_save, buf, ARRAY_LEN(buf)); + if (res) { + tsprintf(buf, + T("unknown error (errno=%d)"), + errno_save); + } + #ifdef WIN32 + if (errno_save == EBUSY) + tstrcpy(buf, T("Resource busy")); + #endif + tfprintf(wimlib_error_file, T(": %"TS), buf); + } + tputc(T('\n'), wimlib_error_file); + fflush(wimlib_error_file); errno = errno_save; - va_end(va); } } +#endif -void wimlib_error_with_errno(const char *format, ...) +/* True if wimlib is to print an informational message when an error occurs. + * This can be turned off by calling wimlib_set_print_errors(false). */ +#ifdef ENABLE_ERROR_MESSAGES +void +wimlib_error(const tchar *format, ...) { - if (__wimlib_print_errors) { - va_list va; - int errno_save; - - va_start(va, format); - errno_save = errno; - fputs("[ERROR] ", stderr); - vfprintf(stderr, format, va); - fprintf(stderr, ": %s\n", strerror(errno_save)); - errno = errno_save; - va_end(va); - } + va_list va; + + va_start(va, format); + wimlib_vmsg(T("\r[ERROR] "), format, va, false); + va_end(va); } -void wimlib_warning(const char *format, ...) +void +wimlib_error_with_errno(const tchar *format, ...) { - if (__wimlib_print_errors) { - va_list va; - int errno_save; - - va_start(va, format); - errno_save = errno; - fputs("[WARNING] ", stderr); - vfprintf(stderr, format, va); - putc('\n', stderr); - errno = errno_save; - va_end(va); - } + va_list va; + + va_start(va, format); + wimlib_vmsg(T("\r[ERROR] "), format, va, true); + va_end(va); } +void +wimlib_warning(const tchar *format, ...) +{ + va_list va; + + va_start(va, format); + wimlib_vmsg(T("\r[WARNING] "), format, va, false); + va_end(va); +} + +void +wimlib_warning_with_errno(const tchar *format, ...) +{ + va_list va; + + va_start(va, format); + wimlib_vmsg(T("\r[WARNING] "), format, va, true); + va_end(va); +} + +#endif + +#if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG) +void wimlib_debug(const tchar *file, int line, const char *func, + const tchar *format, ...) +{ + va_list va; + tchar buf[tstrlen(file) + strlen(func) + 30]; + + static bool debug_enabled = false; + if (!debug_enabled) { + char *value = getenv("WIMLIB_DEBUG"); + if (!value || strcmp(value, "0")) + debug_enabled = true; + else + return; + } + + tsprintf(buf, T("[%"TS" %d] %s(): "), file, line, func); + + va_start(va, format); + wimlib_vmsg(buf, format, va, false); + va_end(va); +} #endif -WIMLIBAPI int wimlib_set_print_errors(bool show_error_messages) +/* API function documented in wimlib.h */ +WIMLIBAPI int +wimlib_set_print_errors(bool show_error_messages) { #ifdef ENABLE_ERROR_MESSAGES - __wimlib_print_errors = show_error_messages; + wimlib_print_errors = show_error_messages; return 0; #else if (show_error_messages) return WIMLIB_ERR_UNSUPPORTED; + else + return 0; +#endif +} + +WIMLIBAPI int +wimlib_set_error_file(FILE *fp) +{ +#ifdef ENABLE_ERROR_MESSAGES + if (wimlib_owns_error_file) + fclose(wimlib_error_file); + wimlib_error_file = fp; + wimlib_print_errors = (fp != NULL); + wimlib_owns_error_file = false; + return 0; +#else + return WIMLIB_ERR_UNSUPPORTED; +#endif +} + +WIMLIBAPI int +wimlib_set_error_file_by_name(const tchar *path) +{ +#ifdef ENABLE_ERROR_MESSAGES + FILE *fp; + +#ifdef __WIN32__ + fp = win32_open_logfile(path); +#else + fp = fopen(path, "a"); +#endif + if (!fp) + return WIMLIB_ERR_OPEN; + wimlib_set_error_file(fp); + wimlib_owns_error_file = true; + return 0; +#else + return WIMLIB_ERR_UNSUPPORTED; #endif } -static const char *error_strings[] = { - [WIMLIB_ERR_SUCCESS] - = "Success", - [WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE] - = "Lookup table is compressed", - [WIMLIB_ERR_DECOMPRESSION] - = "Failed to decompress compressed data", - [WIMLIB_ERR_DELETE_STAGING_DIR] - = "Failed to delete staging directory", - [WIMLIB_ERR_FORK] - = "Failed to fork another process", - [WIMLIB_ERR_FUSE] - = "An error was returned by fuse_main()", - [WIMLIB_ERR_FUSERMOUNT] - = "Could not execute the `fusermount' program, or it exited " - "with a failure status", - [WIMLIB_ERR_IMAGE_COUNT] - = "Inconsistent image count among the metadata " - "resources, the WIM header, and/or the XML data", - [WIMLIB_ERR_IMAGE_NAME_COLLISION] - = "Tried to add an image with a name that is already in use", - [WIMLIB_ERR_INTEGRITY] - = "The WIM failed an integrity check", - [WIMLIB_ERR_INVALID_CHUNK_SIZE] - = "The WIM is compressed but does not have a chunk " - "size of 32768", - [WIMLIB_ERR_INVALID_COMPRESSION_TYPE] - = "The WIM is compressed, but is not marked as having LZX or " - "XPRESS compression", - [WIMLIB_ERR_INVALID_DENTRY] - = "A directory entry in the WIM was invalid", - [WIMLIB_ERR_INVALID_HEADER_SIZE] - = "The WIM header was not 208 bytes", - [WIMLIB_ERR_INVALID_IMAGE] - = "Tried to select an image that does not exist in the WIM", - [WIMLIB_ERR_INVALID_INTEGRITY_TABLE] - = "The WIM's integrity table is invalid", - [WIMLIB_ERR_INVALID_PARAM] - = "An invalid parameter was given", +static const tchar *error_strings[] = { + [WIMLIB_ERR_SUCCESS] + = T("Success"), + [WIMLIB_ERR_ALREADY_LOCKED] + = T("The WIM is already locked for writing"), + [WIMLIB_ERR_DECOMPRESSION] + = T("Failed to decompress compressed data"), + [WIMLIB_ERR_FUSE] + = T("An error was returned by fuse_main()"), + [WIMLIB_ERR_GLOB_HAD_NO_MATCHES] + = T("The provided file glob did not match any files"), + [WIMLIB_ERR_ICONV_NOT_AVAILABLE] + = T("The iconv() function does not seem to work. " + "Maybe check to make sure the directory /usr/lib/gconv exists"), + [WIMLIB_ERR_IMAGE_COUNT] + = T("Inconsistent image count among the metadata " + "resources, the WIM header, and/or the XML data"), + [WIMLIB_ERR_IMAGE_NAME_COLLISION] + = T("Tried to add an image with a name that is already in use"), + [WIMLIB_ERR_INSUFFICIENT_PRIVILEGES] + = T("The user does not have sufficient privileges"), + [WIMLIB_ERR_INTEGRITY] + = T("The WIM file is corrupted (failed integrity check)"), + [WIMLIB_ERR_INVALID_CAPTURE_CONFIG] + = T("The capture configuration string was invalid"), + [WIMLIB_ERR_INVALID_CHUNK_SIZE] + = T("The compression chunk size was unrecognized"), + [WIMLIB_ERR_INVALID_COMPRESSION_TYPE] + = T("The compression type was unrecognized"), + [WIMLIB_ERR_INVALID_HEADER] + = T("The WIM header was invalid"), + [WIMLIB_ERR_INVALID_IMAGE] + = T("Tried to select an image that does not exist in the WIM"), + [WIMLIB_ERR_INVALID_INTEGRITY_TABLE] + = T("The WIM's integrity table is invalid"), + [WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY] + = T("An entry in the WIM's lookup table is invalid"), + [WIMLIB_ERR_INVALID_METADATA_RESOURCE] + = T("The metadata resource is invalid"), + [WIMLIB_ERR_INVALID_MULTIBYTE_STRING] + = T("A string was not valid in the current locale's character encoding"), + [WIMLIB_ERR_INVALID_OVERLAY] + = T("Conflicting files in overlay when creating a WIM image"), + [WIMLIB_ERR_INVALID_PARAM] + = T("An invalid parameter was given"), + [WIMLIB_ERR_INVALID_PART_NUMBER] + = T("The part number or total parts of the WIM is invalid"), + [WIMLIB_ERR_INVALID_PIPABLE_WIM] + = T("The pipable WIM is invalid"), + [WIMLIB_ERR_INVALID_REPARSE_DATA] + = T("The reparse data of a reparse point was invalid"), [WIMLIB_ERR_INVALID_RESOURCE_HASH] - = "The SHA1 message digest of a WIM resource did not match the expected value", - [WIMLIB_ERR_INVALID_RESOURCE_SIZE] - = "A resource entry in the WIM is invalid", - [WIMLIB_ERR_LINK] - = "Failed to create a hard or symbolic link when extracting " - "a file from the WIM", - [WIMLIB_ERR_MKDIR] - = "Failed to create a directory", - [WIMLIB_ERR_MQUEUE] - = "Failed to create or use a POSIX message queue", - [WIMLIB_ERR_NOMEM] - = "Ran out of memory", - [WIMLIB_ERR_NOTDIR] - = "Expected a directory", - [WIMLIB_ERR_NOT_A_WIM_FILE] - = "The file did not begin with the magic characters that " - "identify a WIM file", - [WIMLIB_ERR_NO_FILENAME] - = "The WIM is not identified with a filename", - [WIMLIB_ERR_NOT_ROOT] - = "Root privileges are required for this operation", + = T("The SHA1 message digest of a WIM resource did not match the expected value"), + [WIMLIB_ERR_INVALID_UTF8_STRING] + = T("A string provided as input by the user was not a valid UTF-8 string"), + [WIMLIB_ERR_INVALID_UTF16_STRING] + = T("A string in a WIM dentry is not a valid UTF-16LE string"), + [WIMLIB_ERR_IS_DIRECTORY] + = T("One of the specified paths to delete was a directory"), + [WIMLIB_ERR_IS_SPLIT_WIM] + = T("The WIM is part of a split WIM, which is not supported for this operation"), + [WIMLIB_ERR_LIBXML_UTF16_HANDLER_NOT_AVAILABLE] + = T("libxml2 was unable to find a character encoding conversion handler " + "for UTF-16LE"), + [WIMLIB_ERR_LINK] + = T("Failed to create a hard or symbolic link when extracting " + "a file from the WIM"), + [WIMLIB_ERR_METADATA_NOT_FOUND] + = T("A required metadata resource could not be located"), + [WIMLIB_ERR_MKDIR] + = T("Failed to create a directory"), + [WIMLIB_ERR_MQUEUE] + = T("Failed to create or use a POSIX message queue"), + [WIMLIB_ERR_NOMEM] + = T("Ran out of memory"), + [WIMLIB_ERR_NOTDIR] + = T("Expected a directory"), + [WIMLIB_ERR_NOTEMPTY] + = T("Directory was not empty"), + [WIMLIB_ERR_NOT_A_REGULAR_FILE] + = T("One of the specified paths to extract did not " + "correspond to a regular file"), + [WIMLIB_ERR_NOT_A_WIM_FILE] + = T("The file did not begin with the magic characters that " + "identify a WIM file"), + [WIMLIB_ERR_NO_FILENAME] + = T("The WIM is not identified with a filename"), + [WIMLIB_ERR_NOT_PIPABLE] + = T("The WIM was not captured such that it can be " + "applied from a pipe"), [WIMLIB_ERR_NTFS_3G] - = "NTFS-3g encountered an error (check errno)", - [WIMLIB_ERR_OPEN] - = "Failed to open a file", - [WIMLIB_ERR_OPENDIR] - = "Failed to open a directory", - [WIMLIB_ERR_READ] - = "Could not read data from a file", + = T("NTFS-3g encountered an error (check errno)"), + [WIMLIB_ERR_OPEN] + = T("Failed to open a file"), + [WIMLIB_ERR_OPENDIR] + = T("Failed to open a directory"), + [WIMLIB_ERR_PATH_DOES_NOT_EXIST] + = T("The path does not exist in the WIM image"), + [WIMLIB_ERR_READ] + = T("Could not read data from a file"), [WIMLIB_ERR_READLINK] - = "Could not read the target of a symbolic link", - [WIMLIB_ERR_RENAME] - = "Could not rename a file", - [WIMLIB_ERR_SPECIAL_FILE] - = "Encountered a special file that cannot be archived", - [WIMLIB_ERR_SPLIT_INVALID] - = "The WIM is part of an invalid split WIM", - [WIMLIB_ERR_SPLIT_UNSUPPORTED] - = "The WIM is part of a split WIM, which is not supported for this operation", - [WIMLIB_ERR_STAT] - = "Could not read the metadata for a file or directory", - [WIMLIB_ERR_TIMEOUT] - = "Timed out", - [WIMLIB_ERR_UNKNOWN_VERSION] - = "The WIM file is marked with an unknown version number", - [WIMLIB_ERR_UNSUPPORTED] - = "The requested operation is unsupported", - [WIMLIB_ERR_WRITE] - = "Failed to write data to a file", - [WIMLIB_ERR_XML] - = "The XML data of the WIM is invalid", + = T("Could not read the target of a symbolic link"), + [WIMLIB_ERR_RENAME] + = T("Could not rename a file"), + [WIMLIB_ERR_REPARSE_POINT_FIXUP_FAILED] + = T("Unable to complete reparse point fixup"), + [WIMLIB_ERR_RESOURCE_NOT_FOUND] + = T("A file resource needed to complete the operation was missing from the WIM"), + [WIMLIB_ERR_RESOURCE_ORDER] + = T("The components of the WIM were arranged in an unexpected order"), + [WIMLIB_ERR_SET_ATTRIBUTES] + = T("Failed to set attributes on extracted file"), + [WIMLIB_ERR_SET_REPARSE_DATA] + = T("Failed to set reparse data on extracted file"), + [WIMLIB_ERR_SET_SECURITY] + = T("Failed to set file owner, group, or other permissions on extracted file"), + [WIMLIB_ERR_SET_SHORT_NAME] + = T("Failed to set short name on extracted file"), + [WIMLIB_ERR_SET_TIMESTAMPS] + = T("Failed to set timestamps on extracted file"), + [WIMLIB_ERR_SPLIT_INVALID] + = T("The WIM is part of an invalid split WIM"), + [WIMLIB_ERR_STAT] + = T("Could not read the metadata for a file or directory"), + [WIMLIB_ERR_UNEXPECTED_END_OF_FILE] + = T("Unexpectedly reached the end of the file"), + [WIMLIB_ERR_UNICODE_STRING_NOT_REPRESENTABLE] + = T("A Unicode string could not be represented in the current locale's encoding"), + [WIMLIB_ERR_UNKNOWN_VERSION] + = T("The WIM file is marked with an unknown version number"), + [WIMLIB_ERR_UNSUPPORTED] + = T("The requested operation is unsupported"), + [WIMLIB_ERR_UNSUPPORTED_FILE] + = T("A file in the directory tree to archive was not of a supported type"), + [WIMLIB_ERR_WIM_IS_READONLY] + = T("The WIM is read-only (file permissions, header flag, or split WIM)"), + [WIMLIB_ERR_WRITE] + = T("Failed to write data to a file"), + [WIMLIB_ERR_XML] + = T("The XML data of the WIM is invalid"), + [WIMLIB_ERR_WIM_IS_ENCRYPTED] + = T("The WIM file (or parts of it) is encrypted"), + [WIMLIB_ERR_WIMBOOT] + = T("Failed to set WIMBoot pointer data"), + [WIMLIB_ERR_ABORTED_BY_PROGRESS] + = T("The operation was aborted by the library user"), + [WIMLIB_ERR_UNKNOWN_PROGRESS_STATUS] + = T("The user-provided progress function returned an unrecognized value"), + [WIMLIB_ERR_MKNOD] + = T("Unable to create a special file (e.g. device node or socket)"), + [WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY] + = T("There are still files open on the mounted WIM image"), + [WIMLIB_ERR_NOT_A_MOUNTPOINT] + = T("There is not a WIM image mounted on the directory"), + [WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT] + = T("The current user does not have permission to unmount the WIM image"), + [WIMLIB_ERR_FVE_LOCKED_VOLUME] + = T("The volume must be unlocked before it can be used"), }; -WIMLIBAPI const char *wimlib_get_error_string(enum wimlib_error_code code) +/* API function documented in wimlib.h */ +WIMLIBAPI const tchar * +wimlib_get_error_string(enum wimlib_error_code _code) { - if (code < WIMLIB_ERR_SUCCESS || code > WIMLIB_ERR_XML) - return NULL; - else - return error_strings[code]; + unsigned int code = (unsigned int)_code; + + if (code >= ARRAY_LEN(error_strings) || error_strings[code] == NULL) + return T("Unknown error"); + + return error_strings[code]; } -#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR -void *(*wimlib_malloc_func) (size_t) = malloc; -void (*wimlib_free_func) (void *) = free; -void *(*wimlib_realloc_func)(void *, size_t) = realloc; +static void *(*wimlib_malloc_func) (size_t) = malloc; +static void (*wimlib_free_func) (void *) = free; +static void *(*wimlib_realloc_func)(void *, size_t) = realloc; -void *wimlib_calloc(size_t nmemb, size_t size) +void * +wimlib_malloc(size_t size) +{ + void *ptr; + +retry: + ptr = (*wimlib_malloc_func)(size); + if (unlikely(!ptr)) { + if (!size) { + size++; + goto retry; + } + ERROR("memory exhausted"); + } + return ptr; +} + +void +wimlib_free_memory(void *ptr) +{ + (*wimlib_free_func)(ptr); +} + +void * +wimlib_realloc(void *ptr, size_t size) +{ + if (size == 0) + size = 1; + ptr = (*wimlib_realloc_func)(ptr, size); + if (ptr == NULL) + ERROR("memory exhausted"); + return ptr; +} + +void * +wimlib_calloc(size_t nmemb, size_t size) { size_t total_size = nmemb * size; void *p = MALLOC(total_size); if (p) - memset(p, 0, total_size); + p = memset(p, 0, total_size); return p; } -char *wimlib_strdup(const char *str) +char * +wimlib_strdup(const char *str) { size_t size; char *p; - - size = strlen(str); + + size = strlen(str); p = MALLOC(size + 1); if (p) - memcpy(p, str, size + 1); + p = memcpy(p, str, size + 1); return p; } -extern void xml_set_memory_allocator(void *(*malloc_func)(size_t), - void (*free_func)(void *), - void *(*realloc_func)(void *, size_t)); -#endif - -WIMLIBAPI int wimlib_set_memory_allocator(void *(*malloc_func)(size_t), - void (*free_func)(void *), - void *(*realloc_func)(void *, size_t)) +#ifdef __WIN32__ +wchar_t * +wimlib_wcsdup(const wchar_t *str) { -#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR - wimlib_malloc_func = malloc_func ? malloc_func : malloc; - wimlib_free_func = free_func ? free_func : free; - wimlib_realloc_func = realloc_func ? realloc_func : realloc; + size_t size; + wchar_t *p; - xml_set_memory_allocator(wimlib_malloc_func, wimlib_free_func, - wimlib_realloc_func); - return 0; -#else - ERROR("Cannot set custom memory allocator functions:"); - ERROR("wimlib was compiled with the --without-custom-memory-allocator " - "flag"); - return WIMLIB_ERR_UNSUPPORTED; -#endif + size = wcslen(str); + p = MALLOC((size + 1) * sizeof(wchar_t)); + if (p) + p = wmemcpy(p, str, size + 1); + return p; } +#endif - - -static iconv_t cd_utf16_to_utf8 = (iconv_t)(-1); - -/* Converts a string in the UTF-16 encoding to a newly allocated string in the - * UTF-8 encoding. */ -char *utf16_to_utf8(const char *utf16_str, size_t utf16_len, - size_t *utf8_len_ret) +void * +wimlib_aligned_malloc(size_t size, size_t alignment) { - if (cd_utf16_to_utf8 == (iconv_t)(-1)) { - cd_utf16_to_utf8 = iconv_open("UTF-8", "UTF-16LE"); - if (cd_utf16_to_utf8 == (iconv_t)-1) { - ERROR_WITH_ERRNO("Failed to get conversion descriptor " - "for converting UTF-16LE to UTF-8"); - return NULL; - } - } - size_t utf16_bytes_left = utf16_len; - size_t utf8_bytes_left = utf16_len; - - char *utf8_str = MALLOC(utf8_bytes_left); - if (!utf8_str) - return NULL; - - char *orig_utf8_str = utf8_str; + u8 *raw_ptr; + u8 *ptr; + uintptr_t mask; - size_t num_chars_converted = iconv(cd_utf16_to_utf8, (char**)&utf16_str, - &utf16_bytes_left, &utf8_str, &utf8_bytes_left); + wimlib_assert(alignment != 0 && is_power_of_2(alignment) && + alignment <= 4096); + mask = alignment - 1; - if (num_chars_converted == (size_t)(-1)) { - ERROR_WITH_ERRNO("Failed to convert UTF-16LE string to UTF-8 " - "string"); - FREE(orig_utf8_str); + raw_ptr = MALLOC(size + alignment - 1 + sizeof(size_t)); + if (!raw_ptr) return NULL; - } - size_t utf8_len = utf16_len - utf8_bytes_left; + ptr = (u8 *)raw_ptr + sizeof(size_t); + while ((uintptr_t)ptr & mask) + ptr++; + *((size_t *)ptr - 1) = (ptr - raw_ptr); - *utf8_len_ret = utf8_len; - orig_utf8_str[utf8_len] = '\0'; - return orig_utf8_str; + return ptr; } -static iconv_t cd_utf8_to_utf16 = (iconv_t)(-1); - -/* Converts a string in the UTF-8 encoding to a newly allocated string in the - * UTF-16 encoding. */ -char *utf8_to_utf16(const char *utf8_str, size_t utf8_len, - size_t *utf16_len_ret) +void +wimlib_aligned_free(void *ptr) { - if (cd_utf8_to_utf16 == (iconv_t)(-1)) { - cd_utf8_to_utf16 = iconv_open("UTF-16LE", "UTF-8"); - if (cd_utf8_to_utf16 == (iconv_t)-1) { - ERROR_WITH_ERRNO("Failed to get conversion descriptor " - "for converting UTF-8 to UTF-16LE"); - return NULL; - } - } - - size_t utf8_bytes_left = utf8_len; - size_t utf16_capacity = utf8_len * 4; - size_t utf16_bytes_left = utf16_capacity; - - char *utf16_str = MALLOC(utf16_capacity + 2); - if (!utf16_str) - return NULL; - - char *orig_utf16_str = utf16_str; - - size_t num_chars_converted = iconv(cd_utf8_to_utf16, (char**)&utf8_str, - &utf8_bytes_left, &utf16_str, &utf16_bytes_left); - - if (num_chars_converted == (size_t)(-1)) { - ERROR_WITH_ERRNO("Failed to convert UTF-8 string to UTF-16LE " - "string"); - FREE(orig_utf16_str); - return NULL; - } - - size_t utf16_len = utf16_capacity - utf16_bytes_left; - - *utf16_len_ret = utf16_len; - orig_utf16_str[utf16_len] = '\0'; - orig_utf16_str[utf16_len + 1] = '\0'; - return orig_utf16_str; + if (ptr) + FREE((u8 *)ptr - *((size_t *)ptr - 1)); } -/* Write @n bytes from @buf to the file descriptor @fd, retrying on interupt and - * on short writes. - * - * Returns short count and set errno on failure. */ -ssize_t full_write(int fd, const void *buf, size_t n) +void * +memdup(const void *mem, size_t size) { - const char *p = buf; - ssize_t ret; - ssize_t total = 0; - - while (total != n) { - ret = write(fd, p, n); - if (ret < 0) { - if (errno == EINTR) - continue; - else - break; - } - total += ret; - p += ret; - } - return total; + void *ptr = MALLOC(size); + if (ptr) + ptr = memcpy(ptr, mem, size); + return ptr; } +/* API function documented in wimlib.h */ +WIMLIBAPI int +wimlib_set_memory_allocator(void *(*malloc_func)(size_t), + void (*free_func)(void *), + void *(*realloc_func)(void *, size_t)) +{ + wimlib_malloc_func = malloc_func ? malloc_func : malloc; + wimlib_free_func = free_func ? free_func : free; + wimlib_realloc_func = realloc_func ? realloc_func : realloc; + + xml_set_memory_allocator(wimlib_malloc_func, wimlib_free_func, + wimlib_realloc_func); + return 0; +} static bool seeded = false; -/* Fills @n bytes pointed to by @p with random alphanumeric characters. */ -void randomize_char_array_with_alnum(char p[], size_t n) +static void +seed_random(void) { - int r; + srand(time(NULL) * getpid()); + seeded = true; +} - if (!seeded) { - srand(time(NULL)); - seeded = true; - } +/* Fills @n characters pointed to by @p with random alphanumeric characters. */ +void +randomize_char_array_with_alnum(tchar p[], size_t n) +{ + if (!seeded) + seed_random(); while (n--) { - r = rand() % 62; + int r = rand() % 62; if (r < 26) *p++ = r + 'a'; else if (r < 52) @@ -393,128 +556,25 @@ void randomize_char_array_with_alnum(char p[], size_t n) } /* Fills @n bytes pointer to by @p with random numbers. */ -void randomize_byte_array(u8 *p, size_t n) +void +randomize_byte_array(u8 *p, size_t n) { - if (!seeded) { - srand(time(NULL)); - seeded = true; - } + if (!seeded) + seed_random(); while (n--) *p++ = rand(); } -/* Takes in a path of length @len in @buf, and transforms it into a string for - * the path of its parent directory. */ -void to_parent_name(char buf[], size_t len) -{ - ssize_t i = (ssize_t)len - 1; - while (i >= 0 && buf[i] == '/') - i--; - while (i >= 0 && buf[i] != '/') - i--; - while (i >= 0 && buf[i] == '/') - i--; - buf[i + 1] = '\0'; -} - -/* Like the basename() function, but does not modify @path; it just returns a - * pointer to it. */ -const char *path_basename(const char *path) -{ - const char *p = path; - while (*p) - p++; - p--; - - /* Trailing slashes. */ - while ((p != path - 1) && *p == '/') - p--; - - while ((p != path - 1) && *p != '/') - p--; - - return p + 1; -} - -/* - * Returns a pointer to the part of @path following the first colon in the last - * path component, or NULL if the last path component does not contain a colon. - */ -const char *path_stream_name(const char *path) -{ - const char *base = path_basename(path); - const char *stream_name = strchr(base, ':'); - if (!stream_name) - return NULL; - else - return stream_name + 1; -} - -/* - * Splits a file path into the part before the first '/', or the entire name if - * there is no '/', and the part after the first sequence of '/' characters. - * - * @path: The file path to split. - * @first_part_len_ret: A pointer to a `size_t' into which the length of the - * first part of the path will be returned. - * @return: A pointer to the next part of the path, after the first - * sequence of '/', or a pointer to the terminating - * null byte in the case of a path without any '/'. - */ -const char *path_next_part(const char *path, size_t *first_part_len_ret) -{ - size_t i; - const char *next_part; - - i = 0; - while (path[i] != '/' && path[i] != '\0') - i++; - if (first_part_len_ret) - *first_part_len_ret = i; - next_part = &path[i]; - while (*next_part == '/') - next_part++; - return next_part; -} -/* Returns the number of components of @path. */ -int get_num_path_components(const char *path) +void print_byte_field(const u8 field[], size_t len, FILE *out) { - int num_components = 0; - while (*path) { - while (*path == '/') - path++; - if (*path) - num_components++; - while (*path && *path != '/') - path++; - } - return num_components; + while (len--) + tfprintf(out, T("%02hhx"), *field++); } - -/* - * Prints a string. Printable characters are printed as-is, while unprintable - * characters are printed as their octal escape codes. - */ -void print_string(const void *string, size_t len) +#ifndef HAVE_MEMPCPY +void *mempcpy(void *dst, const void *src, size_t n) { - const u8 *p = string; - - while (len--) { - if (isprint(*p)) - putchar(*p); - else - printf("\\%03hho", *p); - p++; - } -} - -u64 get_wim_timestamp() -{ - struct timeval tv; - gettimeofday(&tv, NULL); - return timeval_to_wim_timestamp(&tv); + return memcpy(dst, src, n) + n; } - - +#endif